Skip to content

Commit

Permalink
Merge pull request #5001 from captain-Akshay/master
Browse files Browse the repository at this point in the history
updated the twitter icon and fixed the css
  • Loading branch information
leecalcote authored Oct 14, 2023
2 parents c72e698 + a5f1b64 commit 6dfe461
Show file tree
Hide file tree
Showing 6 changed files with 373 additions and 313 deletions.
1 change: 1 addition & 0 deletions src/assets/images/socialIcons/twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 11 additions & 19 deletions src/components/SocialLinks-Color/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Col, Row } from "../../reusecore/Layout";
import forum_icon from "../../assets/images/socialIcons/forum.svg";
import mail_icon from "../../assets/images/socialIcons/mail_keppel.svg";
import slack_icon from "../../assets/images/socialIcons/slack-light.svg";
import twitter_icon from "../../assets/images/socialIcons/twitter-light.svg";
import { ReactComponent as TwitterIcon } from "../../assets/images/socialIcons/twitter.svg";
import github_icon from "../../assets/images/socialIcons/github.svg";
import youtube_icon from "../../assets/images/socialIcons/youtube.svg";
import docker_icon from "../../assets/images/socialIcons/docker.svg";
Expand All @@ -15,11 +15,7 @@ const SocialLinksColor = () => {
<SocialLinksWrapper>
<Col xs={12}>
<Row className="social_icons">
<a
href="https://discuss.layer5.io"
target="_blank"
rel="noreferrer"
>
<a href="https://discuss.layer5.io" target="_blank" rel="noreferrer">
<img height="30px" src={forum_icon} alt="forum" />
</a>
<a
Expand All @@ -33,25 +29,21 @@ const SocialLinksColor = () => {
<a href="https://slack.layer5.io/" target="_blank" rel="noreferrer">
<img className="slack" height="30px" src={slack_icon} alt="slack" />
</a>
<a href="https://twitter.com/layer5" target="_blank" rel="noreferrer">
<img
className="twitter"
height="30px"
src={twitter_icon}
alt="twitter"
/>
<a
href="https://twitter.com/layer5"
target="_blank"
rel="noreferrer"
className="footer_twitter"
>
<TwitterIcon />
</a>
<a
href="https://github.com/layer5io"
target="_blank"
rel="noreferrer"
className="github"
>
<img
height="30px"
src={github_icon}
alt="github"
/>
<img height="30px" src={github_icon} alt="github" />
</a>
<a
href="https://www.linkedin.com/company/layer5"
Expand Down Expand Up @@ -97,4 +89,4 @@ const SocialLinksColor = () => {
);
};

export default SocialLinksColor;
export default SocialLinksColor;
73 changes: 36 additions & 37 deletions src/components/SocialLinks-Color/sociallinkscolor.style.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,45 @@
import styled from "styled-components";

const SocialLinksWrapper = styled.div`
.social_icons {
justify-content: flex-end;
a {
margin: 0 0.3rem;
width: 2.5rem;
filter: grayscale(1) invert(0.25);
img {
width: 2rem;
}
&:hover {
filter: grayscale(0) invert(0);
}
}
.github:hover {
filter: grayscale(0) invert(1);
}
.github {
filter: grayscale(1.5) invert(0.38);
}
.mail_icon {
img {
padding: 0.1rem;
border-radius: 0.25rem;
}
}
.social_icons {
justify-content: flex-end;
.footer_twitter:hover {
color: #fff;
}
a {
margin: 0 0.3rem;
width: 2.5rem;
filter: grayscale(1) invert(0.25);
img {
width: 2rem;
}
&:hover {
filter: grayscale(0) invert(0);
}
}
.github:hover {
filter: grayscale(0) invert(1);
}
.github {
filter: grayscale(1.5) invert(0.38);
}
.mail_icon {
img {
padding: 0.1rem;
border-radius: 0.25rem;
}
}
}
@media screen and (max-width: 575px) {
.social_icons {
margin-bottom: 2rem;
justify-content: center;
}
@media screen and (max-width: 575px) {
.social_icons {
margin-bottom: 2rem;
justify-content: center;
}
}
`;

export default SocialLinksWrapper;
export default SocialLinksWrapper;
132 changes: 97 additions & 35 deletions src/sections/Community/Handbook/connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { Container } from "../../../reusecore/Layout";
import { HandbookWrapper } from "./Handbook.style";
import TOC from "../../../components/handbook-navigation/index";
import twitter_icon from "../../../assets/images/socialIcons/twitter-light.svg";
import { ReactComponent as TwitterIcon } from "../../../assets/images/socialIcons/twitter.svg";
import mail_icon from "../../../assets/images/socialIcons/mail_keppel.svg";
import youtube_icon from "../../../assets/images/socialIcons/youtube-light.svg";
import github_icon from "../../../assets/images/socialIcons/github-light.svg";
Expand Down Expand Up @@ -63,22 +63,71 @@ const Connect = () => {
<h2>Mailing Lists</h2>{" "}
</a>
<ul>

<li><a href="mailto:[email protected]">Layer5 Maintainers</a></li>
<li><a href="mailto:[email protected]">Moderators of Discussion Forum</a></li>
<li><a href="mailto:[email protected]">Meshery Developers</a></li>
<li><a href="mailto:[email protected]">Meshery Users</a></li>
<li><a href="http://[email protected]">Meshery Contributors</a></li>
<li><a href="mailto:[email protected]">Meshery Maintainers</a></li>
<li><a href="http://[email protected]">Meshery Security and Vulnerability Reports</a></li>
<li><a href="mailto:[email protected]">Meshery Community</a></li>
<li><a href="https://groups.google.com/a/getnighthawk.dev/g/developers">Nighthawk Developers</a></li>
<li><a href="https://groups.google.com/u/2/a/getnighthawk.dev/g/maintainers">Nighthawk Maintainers</a></li>
<li><a href="https://groups.google.com/a/getnighthawk.dev/g/users">Nighthawk Users</a></li>
<li><a href="mailto:[email protected]">Service Mesh Performance Community</a></li>
<li><a href="mailto:[email protected]">Service Mesh Performance Maintainers</a></li>
<li><a href="mailto:[email protected]">Service Mesh Performance Users</a></li>
<li><a href="mailto:[email protected]">Layer5 Community Members</a></li>
<li>
<a href="mailto:[email protected]">Layer5 Maintainers</a>
</li>
<li>
<a href="mailto:[email protected]">
Moderators of Discussion Forum
</a>
</li>
<li>
<a href="mailto:[email protected]">Meshery Developers</a>
</li>
<li>
<a href="mailto:[email protected]">Meshery Users</a>
</li>
<li>
<a href="http://[email protected]">
Meshery Contributors
</a>
</li>
<li>
<a href="mailto:[email protected]">Meshery Maintainers</a>
</li>
<li>
<a href="http://[email protected]">
Meshery Security and Vulnerability Reports
</a>
</li>
<li>
<a href="mailto:[email protected]">Meshery Community</a>
</li>
<li>
<a href="https://groups.google.com/a/getnighthawk.dev/g/developers">
Nighthawk Developers
</a>
</li>
<li>
<a href="https://groups.google.com/u/2/a/getnighthawk.dev/g/maintainers">
Nighthawk Maintainers
</a>
</li>
<li>
<a href="https://groups.google.com/a/getnighthawk.dev/g/users">
Nighthawk Users
</a>
</li>
<li>
<a href="mailto:[email protected]">
Service Mesh Performance Community
</a>
</li>
<li>
<a href="mailto:[email protected]">
Service Mesh Performance Maintainers
</a>
</li>
<li>
<a href="mailto:[email protected]">
Service Mesh Performance Users
</a>
</li>
<li>
<a href="mailto:[email protected]">
Layer5 Community Members
</a>
</li>
</ul>
<a id="Calendar">
{" "}
Expand Down Expand Up @@ -189,17 +238,14 @@ const Connect = () => {
<h2>Social Media</h2>{" "}
</a>
<p>
Layer5 is dedicated to empowering engineers and supporting the open source community that create them.
Learn more about Layer5 and connect with the community by following and
engaging with us on our social media accounts.
Layer5 is dedicated to empowering engineers and supporting the
open source community that create them. Learn more about Layer5
and connect with the community by following and engaging with us
on our social media accounts.
</p>
<div>
<p className="channels-para">
<img
className="channels-img"
src={twitter_icon}
alt="twitter"
/>
<TwitterIcon className="twitter" />
&nbsp;&nbsp;
<a href="https://twitter.com/layer5">@layer5</a>,&nbsp;
<a href="https://twitter.com/mesheryio">@mesheryio</a>
Expand All @@ -209,7 +255,10 @@ const Connect = () => {
<p className="channels-para">
<img className="channels-img" src={mail_icon} alt="mail" />
&nbsp;&nbsp;
<a href="mailto:[email protected]">Connect with our community managers for any inquiries or support!</a>
<a href="mailto:[email protected]">
Connect with our community managers for any inquiries or
support!
</a>
</p>
<p className="channels-para">
<img
Expand All @@ -225,21 +274,34 @@ const Connect = () => {
<p className="channels-para">
<img className="channels-img" src={github_icon} alt="github" />
&nbsp;&nbsp;
<a href="https://github.com/layer5io">Discover our projects on GitHub</a>
<a href="https://github.com/layer5io">
Discover our projects on GitHub
</a>
</p>
<p className="channels-para">

<img className="channels-img" src={linkedin_icon} alt="linkedin" />&nbsp;&nbsp;
<a href="https://www.linkedin.com/company/layer5">Join our professional network on LinkedIn</a>
<img
className="channels-img"
src={linkedin_icon}
alt="linkedin"
/>
&nbsp;&nbsp;
<a href="https://www.linkedin.com/company/layer5">
Join our professional network on LinkedIn
</a>
</p>
<p className="channels-para">
<img className="channels-img" src={docker_icon} alt="docker" />&nbsp;&nbsp;
<a href="https://hub.docker.com/u/layer5/">Take control with Docker deployment</a>
<img className="channels-img" src={docker_icon} alt="docker" />
&nbsp;&nbsp;
<a href="https://hub.docker.com/u/layer5/">
Take control with Docker deployment
</a>
</p>
<p className="channels-para">
<img className="channels-img" src={slack_icon} alt="slack" />&nbsp;&nbsp;
<a href="https://slack.layer5.io/">Communicate and collaborate with us on Slack</a>

<img className="channels-img" src={slack_icon} alt="slack" />
&nbsp;&nbsp;
<a href="https://slack.layer5.io/">
Communicate and collaborate with us on Slack
</a>
</p>
</div>
</div>
Expand Down
19 changes: 12 additions & 7 deletions src/sections/Community/Member-single/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Link } from "gatsby";
import { MemberSingleWrapper } from "./memberSingle.style";
import { FaTwitter } from "@react-icons/all-files/fa/FaTwitter";
// import { FaTwitter } from "@react-icons/all-files/fa/FaTwitter";
import { FaGithub } from "@react-icons/all-files/fa/FaGithub";
import { FaLinkedin } from "@react-icons/all-files/fa/FaLinkedin";
import { FaUserTie } from "@react-icons/all-files/fa/FaUserTie";
Expand All @@ -24,6 +24,7 @@ import mesheryCatalogLogo from "../../../assets/images/meshery/meshery-catalog.s
import dockerExtensionLogo from "../../../assets/images/docker-extension/docker-extension-meshery-logo.svg";
import meshMapLogo from "../../../assets/images/meshmap/icon-only/meshmap-icon.svg";
import Button from "../../../reusecore/Button";
import { ReactComponent as TwitterIcon } from "../../../assets/images/socialIcons/twitter.svg";

const MemberSingle = ({ frontmatter }) => {
const {
Expand Down Expand Up @@ -56,7 +57,11 @@ const MemberSingle = ({ frontmatter }) => {
<Row>
<Col xs={12} sm={12} lg={6}>
<Image
className={status.includes("Inactive") ? "profile-image-inactive" : "profile-image"}
className={
status.includes("Inactive")
? "profile-image-inactive"
: "profile-image"
}
{...image_path}
imgStyle={{ objectFit: "contain" }}
alt={name}
Expand Down Expand Up @@ -155,7 +160,7 @@ const MemberSingle = ({ frontmatter }) => {
)}
{badges.includes("meshmap") && (
<li>
<Link to="/meshmap" >
<Link to="/meshmap">
<img
className="profile-social-links"
src={meshMapLogo}
Expand Down Expand Up @@ -210,7 +215,7 @@ const MemberSingle = ({ frontmatter }) => {
)}
{badges.includes("ui-ux") && (
<li>
<Link to="../../handbook/designer" >
<Link to="../../handbook/designer">
<img
className="profile-social-links"
src={uiuxrLogo}
Expand All @@ -237,13 +242,13 @@ const MemberSingle = ({ frontmatter }) => {
</div>
<div className="social-bg">
<ul className="profile-social-links">
{executive_bio &&
{executive_bio && (
<li>
<Link to="bio">
<FaUserTie className="bio" size={32} />
</Link>
</li>
}
)}
{github && (
<li>
<a href={`https://github.com/${github}`}>
Expand All @@ -254,7 +259,7 @@ const MemberSingle = ({ frontmatter }) => {
{twitter && (
<li>
<a href={`https://twitter.com/${twitter}`}>
<FaTwitter className="twitter" size={32} />
<TwitterIcon class="twitter" />
</a>
</li>
)}
Expand Down
Loading

0 comments on commit 6dfe461

Please sign in to comment.