Skip to content

Commit 00ef5fc

Browse files
author
Vivek Vishal
authored
Merge branch 'master' into open-source-banner
2 parents f87c8d2 + 6a39b6b commit 00ef5fc

8 files changed

Lines changed: 66 additions & 13 deletions

File tree

Lines changed: 44 additions & 0 deletions
Loading

src/collections/blog/Blog.style.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ export const BlogWrapper = styled.div`
6363
}
6464
}
6565
h3 {
66+
margin-top: .75rem;
6667
margin-bottom: .75rem;
6768
}
69+
ul {
70+
margin-bottom: .75rem;
71+
}
6872
.to-uppercase {
6973
text-transform: uppercase;
7074
}

src/components/CommonForm/commonForm.style.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ margin: 1rem;
108108
color: ${props => props.theme.primaryColor};
109109
}
110110
111-
.options {
112-
color: ${props => props.theme.textColor};
113-
}
114-
115-
.formRight option {
116-
color: black;
117-
}
118-
119111
.custom-arrow {
120112
background-color: white;
121113
width: 2rem;

src/sections/Community/Handbook/security-vulnerabilities.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import MesheryOperator from "../../../assets/images/meshery-operator/meshery-ope
99
import MeshSync from "../../../assets/images/meshsync/meshsync.svg";
1010
import servicemeshperformance from "../../../assets/images/service-mesh-performance/icon/smp-dark.svg";
1111
import meshery from "../../../assets/images/meshery/icon-only/meshery-logo-light.svg";
12+
import mesheryextension from "../../../assets/images/meshery-extensions/icon-only/meshery-extensions-color.svg";
1213
import servicemeshpattern from "../../../assets/images/service-mesh-patterns/service-mesh-pattern.svg";
1314
import Kanvas from "../../../assets/images/kanvas/icon-only/kanvas-icon-color.svg";
1415

@@ -25,7 +26,7 @@ const SecurityVulnerabilitiesPage = () => {
2526
<h2 className="heading-top">Reporting a vulnerability</h2><br />
2627
<p>We are very grateful to the security researchers and users that report security vulnerabilities. We investigate each report thoroughly.</p>
2728
<p>To make a report, send an email to the private <a href="mailto: security@layer5.io">security@layer5.io</a> mailing list with the vulnerability details. For normal product bugs unrelated to latent security vulnerabilities, please head to the appropriate repository and submit a <a href="https://github.com/layer5io/layer5/issues/new/choose">new issue</a> .</p>
28-
<p>Note that the Layer5 community spans five GitHub organizations:</p>
29+
<p>Note that the Layer5 community spans six GitHub organizations:</p>
2930
<ul className="project-org-list">
3031
<li>
3132
<a href="https://github.com/layer5io">
@@ -93,6 +94,16 @@ const SecurityVulnerabilitiesPage = () => {
9394
style={{ marginLeft: ".3rem" }}
9495
/>Kanvas.
9596
</li>
97+
<li>
98+
<a href="https://github.com/meshery-extensions">
99+
<img
100+
src={mesheryextension}
101+
alt="meshery extension icon"
102+
/>
103+
&nbsp; Meshery Extensions
104+
</a>
105+
- plugins or add-ons providing extra functionalities that can be used to customize, extend and integrate with other tools and services.
106+
</li>
96107
</ul>
97108
<p>You can find the list of all the Layer5 project repositories <a href="https://layer5.io/community/handbook/repository-overview">here</a></p>
98109
<h3>When to report a security vulnerability?</h3>

src/sections/Community/Member-single/executive_bio.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const MemberBio = ({ frontmatter, body }) => {
8787
)}
8888
{email && (
8989
<li>
90-
<a href={`mailto:=${email}`}>
90+
<a href={`mailto:${email}`}>
9191
<MdMail className="github" size={32} />
9292
</a>
9393
</li>

src/sections/Company/Brand/Brand-components/layer5.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ const Layer5Brand = () => {
9090
}} className="color-code-wrapper">
9191
<ColorBox name="Keppel" R="0" G="179" B="159" colorCode="#00B39F" />
9292
<ColorBox name="Caribbean Green" R="0" G="211" B="169" colorCode="#00D3A9" />
93-
<ColorBox name="Saffron" R="235" G="192" B="23" colorCode="#EBC017" />
93+
<div className="saffron-color-box">
94+
<ColorBox name="Saffron" R="235" G="192" B="23" dark colorCode="#EBC017" />
95+
</div>
9496
<div className="blond-color-box">
9597
<ColorBox name="Blond" R="255" G="243" B="197" dark colorCode="#FFF3C5" />
9698
</div>

src/sections/Company/Brand/brandPage.style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ const BrandPageWrapper = styled.section`
218218
margin-top: 2rem;
219219
}
220220
221-
.blond-color-box, .white-color-box {
221+
.blond-color-box, .white-color-box, .saffron-color-box {
222222
.PalletBox {
223223
color: rgb(30, 33, 23);
224224
.color-name {

src/sections/Projects/Sistent/components/select/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export function SectionNav() {
239239
/>
240240
<TabButton
241241
className={
242-
location.pathname === "/projects/sistent/components/selet/guidance"
242+
location.pathname === "/projects/sistent/components/select/guidance"
243243
? "active"
244244
: ""
245245
}

0 commit comments

Comments
 (0)