Skip to content

Commit c8928b7

Browse files
Namanv0509Namanv0509
authored
Merge branch 'master' into master
2 parents 7886749 + 6074d46 commit c8928b7

File tree

20 files changed

+753
-114
lines changed

20 files changed

+753
-114
lines changed

‎src/components/Animated-steps-list/Steps-list/StepsList.style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const StepsListWrapper = styled.div`
88
99
& > li {
1010
&:not(:last-of-type) {
11-
margin-bottom: 600px;
11+
margin-bottom: 150px;
1212
1313
@media (max-width: 850px) {
1414
margin-bottom: 88px;

‎src/components/Animated-steps-list/hero/hero.style.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ export const HeroWrapper = styled.div`
77
font-weight: 600;
88
}
99
10-
padding: 12rem 0 20rem 0;
10+
padding: 4rem 0 4rem 0;
1111
1212
@media (max-width: 800px) {
13-
padding: 2rem 0 10rem 0;
13+
padding: 1rem 0 2rem 0;
1414
}
1515
1616
.content {

‎src/components/Animated-steps-list/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import FramedTerminal from "../Animated-terminal/Framed-terminal";
77
import { AnimatedStepsListWrapper } from "./AnimatedStepsList.style";
88

99
// The breakpoints where the next step of each animation triggers
10-
const breakpoints = [0, 350, 1400, 2450, 2680];
10+
const breakpoints = [0, 300, 800, 1300, 1700];
1111

1212
// The number of pixels before the next breakpoint that the animation should complete
13-
const animationBottomPadding = [0, 620, 575, -50];
13+
const animationBottomPadding = [0, 180, 180, 50];
1414

1515
const calculateCurrentFrame = (terminalSteps, currentIndex, scrollPosition) => {
1616
const percentage = Math.min(
@@ -37,7 +37,7 @@ const AnimatedStepsList = ({ terminalHeroState, steps }) => {
3737
const scrollPosition = useScrollPosition();
3838
const [indicatorIndex, setIndicatorIndex] = useState(0);
3939
const activeTerminalStateIndex =
40-
scrollPosition <= 350 ? 0 : indicatorIndex + 1;
40+
scrollPosition <= 300 ? 0 : indicatorIndex + 1;
4141
const terminalSteps = [terminalHeroState].concat(
4242
steps.map((step) => step.terminal)
4343
);

‎src/components/SistentNavigation/content.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,19 @@ export const content = [
6363
{ id: 44, link: "/projects/sistent/components/select/guidance", text: "Select" },
6464
{ id: 45, link: "/projects/sistent/components/select/code", text: "Select" },
6565

66-
{ id: 46, link: "/projects/sistent/components/text-field", text: "Text Field" },
67-
{ id: 47, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
68-
{ id: 48, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
66+
{ id: 46, link: "/projects/sistent/components/switch", text: "Switch" },
67+
{ id: 47, link: "/projects/sistent/components/switch/guidance", text: "Switch" },
68+
{ id: 48, link: "/projects/sistent/components/switch/code", text: "Switch" },
6969

70-
{ id: 49, link: "/projects/sistent/components/text-input", text: "Text Input" },
71-
{ id: 50, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
72-
{ id: 51, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
70+
{ id: 49, link: "/projects/sistent/components/text-field", text: "Text Field" },
71+
{ id: 50, link: "/projects/sistent/components/text-field/guidance", text: "Text Field" },
72+
{ id: 51, link: "/projects/sistent/components/text-field/code", text: "Text Field" },
7373

74-
{ id: 52, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
75-
{ id: 53, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
76-
{ id: 54, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
74+
{ id: 52, link: "/projects/sistent/components/text-input", text: "Text Input" },
75+
{ id: 53, link: "/projects/sistent/components/text-input/guidance", text: "Text Input" },
76+
{ id: 54, link: "/projects/sistent/components/text-input/code", text: "Text Input" },
77+
78+
{ id: 55, link: "/projects/sistent/components/tooltip", text: "Tooltip" },
79+
{ id: 56, link: "/projects/sistent/components/tooltip/guidance", text: "Tooltip" },
80+
{ id: 57, link: "/projects/sistent/components/tooltip/code", text: "Tooltip" },
7781
];

‎src/pages/learn/service-mesh-books.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import React from "react";
22

33
import SEO from "../../components/seo";
44
import BooksPage from "../../sections/Learn/Books-grid";
5-
import LearnServiceMeshCTA from "../../sections/Learn/Learn-Service-Mesh-CTA";
5+
import KanvasCTA from "../../sections/Kanvas/kanvas-cta";
66

77
const BooksGridPage = ({ hide_path }) => {
88
return (
99
<>
1010
<BooksPage hide_path={hide_path} />
11-
<LearnServiceMeshCTA />
11+
<KanvasCTA />
1212

1313
</>
1414
);

‎src/pages/subscribe.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ import SEO from "../components/seo";
33

44

55
import ContactSubscribeSection from "../components/ContactCard";
6+
import KanvasCTA from "../sections/Kanvas/kanvas-cta";
7+
68
const SubscribeSection = () => {
79
return (
810
<>
911
<ContactSubscribeSection />
12+
<KanvasCTA />
1013

1114
</>
1215
);

‎src/pages/unsubscribe.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ import SEO from "../components/seo";
33

44

55
import ContactUnSubscribeSection from "../components/ContactCard-unsubscribe";
6+
import KanvasCTA from "../sections/Kanvas/kanvas-cta";
7+
68
const UnSubscribeSection = () => {
79
return (
810
<>
911
<ContactUnSubscribeSection />
12+
<KanvasCTA />
1013

1114
</>
1215
);

‎src/sections/Community/Handbook/repo-data.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,54 @@ export const repo_data = [
169169
link: ["https://layer5.io/community/members/zihan-kuang"],
170170
repository: "https://github.com/layer5io/docs",
171171
},
172+
{
173+
project: "Academy Theme",
174+
image: five,
175+
site: "https://github.com/layer5io/academy-theme",
176+
language: "Hugo",
177+
maintainers_name: ["Zihan Kuang", "Aabid Sofi"],
178+
link: [
179+
"https://layer5.io/community/members/zihan-kuang",
180+
"https://layer5.io/community/members/aabid-sofi"
181+
],
182+
repository: "https://github.com/layer5io/academy-theme",
183+
},
184+
{
185+
project: "Academy Build",
186+
image: five,
187+
site: "https://github.com/layer5io/academy-build",
188+
language: "Hugo build / GitHub Action",
189+
maintainers_name: ["Aabid Sofi"],
190+
link: ["https://layer5.io/community/members/aabid-sofi"],
191+
repository: "https://github.com/layer5io/academy-build",
192+
},
193+
{
194+
project: "Academy Example",
195+
image: five,
196+
site: "https://github.com/layer5io/academy-example",
197+
language: "Hugo",
198+
maintainers_name: ["Zihan Kuang"],
199+
link: ["https://layer5.io/community/members/zihan-kuang"],
200+
repository: "https://github.com/layer5io/academy-example",
201+
},
202+
{
203+
project: "Exoscale Academy",
204+
image: five,
205+
site: "https://github.com/layer5io/exoscale-academy",
206+
language: "Hugo",
207+
maintainers_name: ["Vacant"],
208+
link: ["#"],
209+
repository: "https://github.com/layer5io/exoscale-academy",
210+
},
211+
{
212+
project: "Layer5 Academy",
213+
image: five,
214+
site: "https://github.com/layer5io/layer5-academy",
215+
language: "Hugo",
216+
maintainers_name: ["Vacant"],
217+
link: ["#"],
218+
repository: "https://github.com/layer5io/layer5-academy",
219+
},
172220
],
173221
},
174222

‎src/sections/Devrel-platform/content.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import InlineQuotes from "../../components/Inline-quotes";
1010
import YashSharmaIMg from "../../collections/members/yash-sharma/yash-sharma.webp";
1111
import NicJacksonImg from "../../collections/members/nicholas-jackson/nic-jackson.webp";
1212
import RutkIkegahImg from "../../collections/members/ruth-ikegah/ruth-ikegah.jpg";
13+
14+
1315
const DevrelContentWrapper = styled.div`
1416
min-height: fit-content;
1517
border-width: 2px 2px 2px 2px;
@@ -181,6 +183,9 @@ const DevrelContentWrapper = styled.div`
181183
top: 10.75rem;
182184
left: calc(50% + 2rem);
183185
}
186+
.meshmate-badge {
187+
width: 90%;
188+
}
184189
}
185190
}
186191
}
@@ -210,6 +215,11 @@ const DevrelContentWrapper = styled.div`
210215
top: 8.75rem;
211216
left: calc(50% + 0rem);
212217
}
218+
.meshmate-badge {
219+
width: 90%;
220+
height: 105%;
221+
margin-left: 1rem;
222+
margin-top: 0.6rem;
213223
}
214224
}
215225
}
@@ -334,8 +344,9 @@ const DevrelContent = () => {
334344
</div>
335345
<div className="badge-item">
336346
<img
337-
src="https://badges.layer5.io/assets/badges/meshery/meshery.png"
338-
alt="Meshery Badge"
347+
src="https://badges.layer5.io/assets/badges/meshmate/meshmate.png"
348+
alt="Meshmate Badge"
349+
className="meshmate-badge"
339350
/>
340351
</div>
341352
</div>

‎src/sections/Pricing/generatePlans.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ function generatePlans(data) {
1717
"TeamDesigner": {
1818
tier: "Team Designer",
1919
featured: false,
20-
monthlyprice: 8,
21-
yearlyprice: 68,
20+
monthlyprice: 16,
21+
yearlyprice: 164,
2222
byline: "Advanced collaboration for declarative DevOps",
2323
byline2: "← Everything included in Free, plus...",
2424
button: ["Start Free Trial", "https://cloud.layer5.io"],
2525
},
2626
"TeamOperator": {
2727
tier: "Team Operator",
2828
featured: false,
29-
monthlyprice: 8,
30-
yearlyprice: 68,
29+
monthlyprice: 16,
30+
yearlyprice: 164,
3131
// pricing_coming_soon: <img src={comingSoon} alt="Coming Soon" />,
3232
byline: "Advanced collaboration for imperative DevOps",
3333
byline2: "← Everything included in Free, plus...",
@@ -36,8 +36,8 @@ function generatePlans(data) {
3636
"Enterprise": {
3737
tier: "Enterprise",
3838
featured: true,
39-
monthlyprice: 22,
40-
yearlyprice: 248,
39+
monthlyprice: 44,
40+
yearlyprice: 449,
4141
pricing_coming_soon: <img src={comingSoon} alt="Coming Soon" />,
4242
byline: "Flexible deployment, and MSP multi-tenancy.",
4343
byline2: "← Everything included in Team, plus...",

0 commit comments

Comments
 (0)