Skip to content

Commit

Permalink
Merge branch 'master' into renameOSM
Browse files Browse the repository at this point in the history
  • Loading branch information
iArchitSharma authored Apr 19, 2024
2 parents 06822cf + 80ac5ce commit 00fa8da
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 5 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/collections/members/deepak-reddy/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Deepak Reddy
position: Contributor
image_path: ./deepak-reddy.jpg
github: deepak4566
twitter: DeepakR95448261
linkedin: deepak4566
bio: Deepak is an tech enthusiast who loves to solve real world enginnering problems , he is an freelancer in ML and cloud enginnering where he solves problems like reducing latency ,downtime and designing backend architecture for organisations , he is also passionate about cloud native technologies and active contributor for kubernetes , layer5 . He is also tech youtuber where he discuss about production grade cloud projects which include cloud native ecosystem.
badges:
status: Active
published: true
---
2 changes: 1 addition & 1 deletion src/collections/members/uzair-shaikh/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ badges:
- meshery-operator
- nighthawk
- meshmap
status: Active
status: Inactive
published: true
---
2 changes: 1 addition & 1 deletion src/components/SistentNavigation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const TOC = () => {
className="toc-sub-heading identity"
onClick={() => setExpandIdentity((prev) => !prev)}
>
Idenitity
Identity
{expandIdenity ? <IoIosArrowUp /> : <IoIosArrowDown />}
</li>
{expandIdenity && (
Expand Down
9 changes: 9 additions & 0 deletions src/sections/Community/community.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ const CommunitySectionWrapper = styled.div`
background-color: ${props => props.theme.secondaryLightColorTwo};
transition: 0.8s cubic-bezier(0.2, 0.8, 0.2, 1);
}
.meshmate-img-transparent {
background-color: transparent;
}
svg {
max-width: 25rem;
.meshmate-stack-colorMode_svg__colorMode1 {
Expand Down Expand Up @@ -193,6 +198,10 @@ const CommunitySectionWrapper = styled.div`
}
}
}
.meshmate-link-transparent {
background-color: transparent;
}
}
.newcomers-section {
Expand Down
4 changes: 2 additions & 2 deletions src/sections/Community/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ const CommunityPage = () => {
</p>
</Col>
<Col sm={12} lg={6}>
<MeshmateIcon className="meshmate-img" />
<Link className="meshmate-link" to="/community/meshmates">
<MeshmateIcon className="meshmate-img meshmate-img-transparent" />
<Link className="meshmate-link meshmate-link-transparent" to="/community/meshmates">
<h2>Open Source Mentorship Program</h2>
<button className="icon" aria-label="mentorship-program">
<FaArrowRight />
Expand Down
23 changes: 22 additions & 1 deletion src/sections/Projects/Sistent/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,28 @@ const SistentAbout = () => {
<a id="About Sistent">
<h2>About Sistent</h2>
</a>
<p>Sorry, this page is still under work</p>
<p>
We have several different React apps that heavily uses the
Material UI v4 and v5 libraries, and this discrepancies led up to
setting up the Sistent Design System.
</p>
<p>
<b>
We want to be able to have the source of truth of what Layer5.io
and Meshery looks like.
</b>
</p>
<p>
'Sistent' is a play on word to ensure that we have a consistent
theme, components, design tokens, etc across all of the apps that
will be using this library. Sistent is a design system that uses
the <b>MUI v5 components</b> and a <b>custom theme provider </b>
instead of using the default theme from MUI v5.
</p>
<p>
If you’re interested in joining, please let us know, and we can
help you get started on contributing to the Sistent Design System.
</p>
</div>
<SistentPagination />
</Container>
Expand Down

0 comments on commit 00fa8da

Please sign in to comment.