Skip to content

Commit 1267bc4

Browse files
Namanv0509Namanv0509
authored
Merge branch 'master' into tos
2 parents 442502f + 29293d4 commit 1267bc4

4 files changed

Lines changed: 27 additions & 29 deletions

File tree

‎src/collections/events/2024/hacktoberfest-2024/index.mdx‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,21 @@ import hacktoberfestBadge from "./layer5-hacktoberfest11-badge-large.png";
2626
Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
2727
</p>
2828

29-
<h3>Earn a Badge </h3>
30-
<p>Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.</p>
31-
<img src={hacktoberfestBadge} style="width: 250px"/>
32-
29+
<div style={{ display: 'flex', alignItems: 'flex-start', gap: '20px', marginBottom: '-230px' }}>
30+
<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-start' , marginBottom: '-20px' }}>
31+
<h3 style={{ margin: '0', marginBottom: '10px', whiteSpace: 'nowrap' }}>Earn a Badge</h3>
32+
<p style={{ margin: '0', width: '800px' }}>
33+
Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.
34+
</p>
35+
</div>
36+
<img src={hacktoberfestBadge} style={{ width: '250px', flexShrink: '0', marginLeft: '80px' , marginTop: '-50px' }} />
37+
</div>
38+
<h3 style={{ marginBottom: '10px'}} >Event Details</h3>
3339
<ul>
3440
<li><strong>DATE:</strong>September 27, 2024</li>
3541
<li><strong>TIME:</strong>10AM CT | 4PM WAT | 8:30PM IST</li>
3642
<li><strong>LIVESTREAM:</strong> <a href="https://www.youtube.com/watch?v=iKe52yMWWK4">YouTube</a></li>
3743
</ul>
38-
3944
<p> Resources:</p>
4045
<ul>
4146
<li><Link to="/blog/open-source/ways-to-contribute-at-layer5">Code and Non-Code Contributing at Layer5</Link></li>

‎src/collections/events/2025/hacktoberfest-2025/index.mdx‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,32 @@ import hacktoberfestTheme from "./hacktoberfest-meshery-theme.webp";
2424

2525
<p>As in years past, Layer5 has a number of different projects and a variety of technologies for participants to choose from. For Hacktoberfest 2025, our theme will center on Designing with Meshery. <Link to="/cloud-native-management/meshery">Meshery</Link> is an extensible, self-service platform for collaborative infrastructure management. Be sure to understand the <Link to="/blog/meshery/comparing-meshery-models-and-meshery-designs">difference between Meshery Models and Meshery Designs</Link>. The Meshery project is looking for contributors to extend these models to support new cloud native infrastructure and their features.</p>
2626

27-
<img src={hacktoberfestOpenArms} style="width: 350px; margin-right: 20px; float: left;"/>
27+
<img src={hacktoberfestOpenArms} style="width: 750px; margin-right: 20px; float: left;"/>
2828

2929
<p>
3030
Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects the easy way with Layer5 <Link to="/community/meshmates">MeshMates</Link> and Maintainers. Spend an hour with seasoned, open source maintainers and hack your way through. To get a head start, see our <Link to="/community/newcomers">Newcomers Resources</Link>. Get familiar with the Layer5 community through our <Link to="/community/handbook">Community Handbook</Link>.
3131
</p>
3232

33-
<h3>Earn a Badge </h3>
34-
<p>Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.</p>
35-
<img src={hacktoberfestBadge} style="width: 250px"/>
33+
<div style={{ display: 'flex', alignItems: 'flex-start', marginBottom: '-200px' }}>
34+
<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-start' , marginBottom: '-20px' }}>
35+
<h3 style={{ margin: '0', marginBottom: '10px', whiteSpace: 'nowrap' }}>Earn a Badge</h3>
36+
<p style={{ margin: '0', width: '900px' }}>
37+
Earn a Hacktoberfest Contributor badge by contributing to Layer5 projects during this Hacktoberfest.
38+
</p>
39+
</div>
40+
<img src={hacktoberfestBadge} style={{ width: '250px', flexShrink: '0', marginLeft: '80px' , marginTop: '-50px' }} />
41+
</div>
42+
43+
<h3 style={{marginBottom: '10px'}}>Event Details</h3>
44+
3645

3746
<ul>
3847
<li><strong>DATE: </strong>October 3rd, 2025</li>
3948
<li><strong>TIME: </strong> 14:00 UTC (9AM CDT | 4PM CEST | 3PM WAT | 7:30PM IST)</li>
40-
{/* <li><strong>LIVESTREAM:</strong> <a href="https://www.youtube.com/watch?v=iKe52yMWWK4">YouTube</a></li> */}
41-
<li><strong>LIVESTREAM:</strong> <a href="https://youtube.com/live/1-oaEy0Pm5I?feature=share">Livestream</a></li>
49+
<li><strong>LIVESTREAM:</strong> <a href="https://youtube.com/live/1-oaEy0Pm5I?feature=share">Livestream</a></li>
4250
</ul>
4351

44-
<p> Resources:</p>
52+
<p>Resources:</p>
4553

4654
<ul>
4755
<li><Link to="/blog/open-source/ways-to-contribute-at-layer5">Code and Non-Code Contributing at Layer5</Link></li>

‎src/components/Pricing/PricingAddons/index.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -328,18 +328,6 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
328328
</Box>
329329

330330
<Box sx={boxStyles.learnerSection}>
331-
<Typography variant="h6" sx={typographyStyles.learnerCount}>
332-
{(() => {
333-
// Determine which sub-addon to show learner count for
334-
let targetSubAddon = null;
335-
if (selectedSubAddOns["academy-practical"]) {
336-
targetSubAddon = selectedAddon?.subAddOns?.find(sub => sub.id === "academy-practical");
337-
} else {
338-
targetSubAddon = selectedAddon?.subAddOns?.find(sub => sub.id === "academy-theory");
339-
}
340-
return targetSubAddon?.pricing?.[quantityIndex]?.learners || 0;
341-
})()} Learners
342-
</Typography>
343331
<Slider
344332
value={quantityIndex}
345333
onChange={(event, newValue) => setQuantityIndex(newValue)}
@@ -429,9 +417,6 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
429417
{selectedAddon !== null && selectedAddon.id !== "academy" && (
430418
<>
431419
<Box sx={boxStyles.unitQuantitySection}>
432-
<Typography variant="h6" sx={boxStyles.unitQuantityTitle}>
433-
{selectedAddon.pricing?.[quantityIndex]?.units || 0} {selectedAddon?.unitLabel}
434-
</Typography>
435420
<Slider
436421
value={quantityIndex}
437422
onChange={(event, newValue) => setQuantityIndex(newValue)}

‎src/components/Pricing/PricingAddons/styles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ export const boxStyles = {
153153
display: "flex",
154154
justifyContent: "center",
155155
flexWrap: "wrap",
156-
gap: 1,
157-
mt: 2
156+
gap: 0,
157+
mt: 0
158158
},
159159
sliderMarks: {
160160
textAlign: "center",

0 commit comments

Comments
 (0)