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

Convert all the css into tailwind css of SocialMedia component #1742

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 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
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
13 changes: 6 additions & 7 deletions components/SocialMedia/SocialMedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,39 @@ import YouTubeLogo from 'static/images/icons/youtube_logo.svg';
import LinkedInLogo from 'static/images/icons/linkedin_logo_circle.svg';
import SocialMediaContainer from './SocialMediaContainer/SocialMediaContainer';
import SocialMediaItem from './SocialMediaItem/SocialMediaItem';
import styles from './SocialMedia.module.css';

function SocialMedia() {
return (
<SocialMediaContainer>
<SocialMediaItem
href="https://facebook.com/operationcode.org"
name="Facebook"
svg={<FacebookLogo className={styles.logo} />}
svg={<FacebookLogo className="fill-white w-6" />}
/>
<SocialMediaItem
href="https://twitter.com/operation_code"
name="Twitter"
svg={<TwitterLogo className={styles.logo} />}
svg={<TwitterLogo className="fill-white w-6" />}
/>
<SocialMediaItem
href="https://www.instagram.com/operation_code/"
name="Instagram"
svg={<InstagramLogo className={styles.logo} />}
svg={<InstagramLogo className="fill-white w-6" />}
/>
<SocialMediaItem
href="https://www.youtube.com/channel/UCAoJt4a_KEBmgXfoQUrNbSA"
name="YouTube"
svg={<YouTubeLogo className={styles.logo} />}
svg={<YouTubeLogo className="fill-white w-6" />}
/>
<SocialMediaItem
href="https://www.linkedin.com/company/operationcode/"
name="LinkedIn"
svg={<LinkedInLogo className={styles.logo} />}
svg={<LinkedInLogo className="fill-white w-6" />}
/>
<SocialMediaItem
href="https://github.com/OperationCode/"
name="GitHub"
svg={<GitHubLogo className={styles.logo} />}
svg={<GitHubLogo className="fill-white w-6" />}
/>
</SocialMediaContainer>
);
Expand Down
5 changes: 0 additions & 5 deletions components/SocialMedia/SocialMedia.module.css

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { arrayOf, element } from 'prop-types';
import styles from './SocialMediaContainer.module.css';

SocialMediaContainer.propTypes = { children: arrayOf(element).isRequired };

function SocialMediaContainer({ children }) {
return <div className={styles.SocialMediaContainer}>{children}</div>;
return <div className="flex flex-row justify-around items-center">{children}</div>;
}

export default SocialMediaContainer;

This file was deleted.

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

exports[`SocialMediaContainer should render with required props 1`] = `
<div
className="SocialMediaContainer"
className="flex flex-row justify-around items-center"
>
<div>
Testing 1
Expand Down
3 changes: 1 addition & 2 deletions components/SocialMedia/SocialMediaItem/SocialMediaItem.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { node, string } from 'prop-types';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import ScreenReaderOnly from 'components/ScreenReaderOnly/ScreenReaderOnly';
import styles from './SocialMediaItem.module.css';

SocialMediaItem.propTypes = {
name: string.isRequired,
Expand All @@ -11,7 +10,7 @@ SocialMediaItem.propTypes = {

function SocialMediaItem({ name, href, svg }) {
return (
<div className={styles.SocialMediaItem}>
<div className="my-0 mx-2 opacity-80 hover:opacity-100">
<OutboundLink
analyticsEventLabel={`Social Media Engagement: ${name}`}
hasIcon={false}
Expand Down

This file was deleted.

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

exports[`SocialMediaItem should render with required props 1`] = `
<div
className="SocialMediaItem"
className="my-0 mx-2 opacity-80 hover:opacity-100"
>
<a
className="OutboundLink"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="Facebook"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand All @@ -16,7 +16,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="Twitter"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand All @@ -25,7 +25,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="Instagram"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand All @@ -34,7 +34,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="YouTube"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand All @@ -43,7 +43,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="LinkedIn"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand All @@ -52,7 +52,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = `
name="GitHub"
svg={
<Svg
className="logo"
className="fill-white w-6"
/>
}
/>
Expand Down