Skip to content

Commit 07a1afc

Browse files
authored
Merge pull request layer5io#3827 from Shivam-AfA/meshMapBugs
Fixed meshmap logo responsiveness
2 parents 3337c10 + 3bfa87c commit 07a1afc

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

Diff for: src/sections/Meshmap/FeaturesSection/Collaborate/CollaboratorFeatures_diagram.js

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import Avatar3 from "./images/avatar3.png";
1414
import { useInView } from "react-intersection-observer";
1515

1616
const CollaboratorFeaturesDiagram = ({ activeExampleIndex, theme }) => {
17-
console.log(theme);
1817
const [ref, inView] = useInView({ threshold: 0.4 });
1918
return (
2019
<DiagramStyles>

Diff for: src/sections/Meshmap/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ const Meshmap = ({ theme }) => {
162162
{/* <MesheryAction /> */}
163163

164164
<div className="banner-background">
165-
166-
<Container style={{ marginBottom: "4rem" }}>
165+
<Container style={{ marginBottom: "4rem", padding: "0" }}>
167166
<Row className="description">
168167
<Col lg={7} md={6} sm={12} className="desc-text">
169168
<h1 className="heading-1">Signup for</h1>
@@ -179,7 +178,7 @@ const Meshmap = ({ theme }) => {
179178
</div>
180179
</Col>
181180

182-
<Col lg={5} md={6} sm={12}>
181+
<Col lg={5} md={6} sm={12} style={{ padding: "0" }}>
183182
<CommonForm
184183
title="Join the Beta Program"
185184
form="meshmap"

Diff for: src/sections/Meshmap/meshmap-catalog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ const Catalog = () => {
421421
<section className="services svg-cont">
422422
<div>
423423
<img src={Patterns} />
424-
<p>Service Patterns</p>
424+
<p>Cloud Native Patterns</p>
425425
</div>
426426
<div>
427427
<img src={Ebpf} />

Diff for: src/sections/Meshmap/meshmap.style.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const MeshmapWrapper = styled.div`
2121
margin-top: 3rem;
2222
2323
.desc-text {
24-
padding: 1.56rem;
24+
padding: 0 1rem 0 1rem;
2525
h1{
2626
font-weight: 600;
2727
}

Diff for: src/sections/Meshmap/meshmap_banner.js

+27-16
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ const BannerSectionWrapper = styled.div`
2121
font-weight: 500;
2222
font-size: 60px;
2323
color: ${props => props.theme.white};
24-
2524
line-height: 4.3rem;
2625
margin-bottom: 1rem;
26+
min-width: 18rem;
2727
span {
2828
font-size: 70px;
2929
width: fit-content;
@@ -39,6 +39,10 @@ const BannerSectionWrapper = styled.div`
3939
font-size: 48px;
4040
}
4141
}
42+
@media screen and (max-width: 418px) {
43+
line-height: 3rem;
44+
margin: 1.5rem 0;
45+
}
4246
}
4347
h2 {
4448
margin-bottom: 1rem;
@@ -67,6 +71,7 @@ const BannerSectionWrapper = styled.div`
6771
margin-bottom: .5rem;
6872
font-weight: 400;
6973
font-style: italic;
74+
min-width: 18rem;
7075
font-family: "Qanelas Soft";
7176
span {
7277
color: ${props => props.theme.saffronColor};
@@ -92,6 +97,7 @@ const BannerSectionWrapper = styled.div`
9297
margin-top: -7rem;
9398
position: relative;
9499
left: 30%;
100+
z-index: 0;
95101
96102
}
97103
div.accent-bubble {
@@ -131,42 +137,47 @@ const BannerSectionWrapper = styled.div`
131137
@media screen and (max-width: 992px) {
132138
.meshmap-logo {
133139
width: 8rem;
134-
/* right: 3rem; */
135140
margin-top: -2rem;
141+
left: 15%;
136142
}
137143
border-radius: 0% 85% 0% 0% / 0% 60% 0% 0% ;
138144
}
139145
140146
@media screen and (max-width: 768px) {
141147
padding: 8rem 2rem 3rem;
142148
.meshmap-logo {
143-
margin-top: 10%;
144-
left: 5%;
145-
width: 5rem;
149+
margin-top: -5rem;
150+
margin-right: 2rem;
151+
left: 7%;
152+
min-width: 5rem;
146153
}
147154
border-radius: 0% 85% 0% 0% / 0% 40% 0% 0% ;
148155
}
149-
150-
@media screen and (max-width: 448px) {
156+
@media screen and (max-width: 500px) {
151157
.meshmap-logo {
152-
margin-top: 4rem;
153-
left: 5%;
158+
margin-top: -5rem;
159+
margin-right: 2rem;
160+
left: 0%;
161+
min-width: 3rem;
162+
}
163+
border-radius: 0% 85% 0% 0% / 0% 40% 0% 0% ;
154164
}
155-
}
156-
@media screen and (max-width: 370px) {
165+
@media screen and (max-width: 400px) {
157166
.meshmap-logo {
158-
margin-top: 7rem;
159-
left: 5%;
160-
width: 5rem;
167+
margin-top: -5rem;
168+
margin-right: 0;
169+
left: -20%;
170+
min-width: 3rem;
171+
}
172+
border-radius: 0% 85% 0% 0% / 0% 40% 0% 0% ;
161173
}
162-
}
163174
164175
`;
165176

166177
const BannerSection = () => {
167178
return (
168179
<BannerSectionWrapper>
169-
<div>
180+
<div className="banner-text">
170181
{/* <PageHeader title="MeshMap" subtitle="take the blinders off" superscript="BETA" /> */}
171182
<h2>Step aside, YAML</h2>
172183
<h1><span>MeshMap</span> is here</h1>

0 commit comments

Comments
 (0)