Skip to content

Commit 0296d2c

Browse files
Merge branch 'master' into enhancement/6444-kanvas-page-popup
2 parents 592275a + ee0d6ae commit 0296d2c

File tree

10 files changed

+98
-19
lines changed

10 files changed

+98
-19
lines changed
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/collections/integrations/k8s-config-connector/index.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,6 +2678,12 @@ components: [
26782678
"colorIcon": "icons/components/billing-account/icons/color/billing-account-color.svg",
26792679
"whiteIcon": "icons/components/billing-account/icons/white/billing-account-white.svg",
26802680
"description": "",
2681+
},
2682+
{
2683+
"name": "iam-deny-policy",
2684+
"colorIcon": "icons/components/iam-deny-policy/icons/color/iam-deny-policy-color.svg",
2685+
"whiteIcon": "icons/components/iam-deny-policy/icons/white/iam-deny-policy-white.svg",
2686+
"description": "",
26812687
}]
26822688
featureList: [
26832689
"Provides a wide range of cloud services",

src/collections/members/kelechi-nwachukwu/index.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ badges:
1111
- community
1212
emeritus: yes
1313
blurb: Mesh Head
14+
meshmate: yes
1415
status: Inactive
1516
published: true
1617
---

src/sections/General/Footer/index.js

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Footer = ({ location }) => {
1111
var currentYear = new Date().getFullYear();
1212

1313
const getUrl = (pathname) => {
14-
//remove ".html" that results in live production build
14+
// remove ".html" that results in live production build
1515
if (pathname.endsWith(".html")) {
1616
pathname = pathname.replace(".html", "");
1717
}
@@ -28,6 +28,7 @@ const Footer = ({ location }) => {
2828
"/resources",
2929
"/learn",
3030
];
31+
3132
const test = {
3233
mdx: function (path) {
3334
let returnPath = "";
@@ -50,22 +51,36 @@ const Footer = ({ location }) => {
5051
}) && `src/collections${returnPath}`
5152
);
5253
},
54+
5355
learningPath: function (path) {
5456
return (
5557
path.startsWith("/learn/learning-paths/") &&
5658
`content-learn${pathname.replace("learn/learning-paths/", "")}`
5759
);
5860
},
61+
62+
communityMember: function (path) {
63+
if (path.startsWith("/community/members/")) {
64+
const memberId = path.replace("/community/members/", "");
65+
return `src/collections/members/${memberId}/index.mdx`;
66+
}
67+
return null;
68+
},
5969
};
6070

71+
if (pathname.startsWith("/community/handbook/")) {
72+
const page = pathname.replace("/community/handbook/", "");
73+
return `https://github.com/layer5io/layer5/blob/master/src/pages/community/handbook/${page}.js`;
74+
}
75+
6176
return test.mdx(pathname)
6277
? `https://github.com/layer5io/layer5/tree/master/${test.mdx(pathname)}`
6378
: test.learningPath(pathname)
64-
? `https://github.com/layer5io/layer5/tree/master/${test.learningPath(
65-
pathname
66-
)}`
67-
: `https://github.com/layer5io/layer5/blob/master/src/pages${pathname == "/" ? "" : pathname
68-
}${indexUrl.some((str) => pathname.endsWith(str)) ? "/index" : ""}.js`;
79+
? `https://github.com/layer5io/layer5/tree/master/${test.learningPath(pathname)}`
80+
: test.communityMember(pathname)
81+
? `https://github.com/layer5io/layer5/blob/master/${test.communityMember(pathname)}`
82+
: `https://github.com/layer5io/layer5/blob/master/src/pages${pathname == "/" ? "" : pathname
83+
}${indexUrl.some((str) => pathname.endsWith(str)) ? "/index" : ""}.js`;
6984
};
7085

7186
return (

src/sections/Home/Banner-1/banner1.style.js

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,15 @@ const Banner1SectionWrapper = styled.section`
142142
}
143143
}
144144
@media only screen and (max-width: 760px) {
145-
padding: 2rem 0;
145+
min-height: 320px;
146+
padding: 1.2rem 0 1.5rem 0;
147+
.background-svg {
148+
width: 7.2rem;
149+
min-height: 9.6rem;
150+
top: 10px;
151+
right: -1.6rem;
152+
opacity: 0.7;
153+
}
146154
.section-title-wrapper {
147155
min-width: 100%;
148156
}
@@ -167,7 +175,15 @@ const Banner1SectionWrapper = styled.section`
167175
}
168176
}
169177
@media only screen and (max-width: 480px) {
170-
padding: 2rem 0;
178+
min-height: 220px;
179+
padding: 0.7rem 0 1rem 0;
180+
.background-svg {
181+
width: 9.6rem;
182+
min-height: 6.4rem;
183+
top: 30px;
184+
right: -2.88rem;
185+
opacity: 0.5;
186+
}
171187
.vintage-box{
172188
&:before{
173189
content: none;

src/sections/Home/Banner-2/banner2.style.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ const Banner2SectionWrapper = styled.section`
107107
}
108108
}
109109
@media only screen and (max-width: 760px) {
110-
padding: 2rem 0;
111-
background-position: bottom 100px right 10px, bottom right;
112-
background-size: 25%;
113-
110+
min-height: 320px;
111+
padding: 1.2rem 0 1.5rem 0;
112+
background-position: bottom 60px right 5px, bottom right;
113+
background-size: 2.88rem, 2.4rem;
114114
.section-title {
115115
h1 { margin: 0rem; }
116116
}
@@ -127,10 +127,10 @@ const Banner2SectionWrapper = styled.section`
127127
128128
}
129129
@media only screen and (max-width: 480px) {
130-
padding: 2rem 0;
131-
background-position: bottom 230px right 20px, bottom 180px right;
132-
background-size: 20%;
133-
130+
min-height: 180px;
131+
padding: 0.7rem 0 1rem 0;
132+
background-position: bottom 30px right 2px, bottom 10px right;
133+
background-size: 2.08rem, 1.6rem;
134134
.section-title{
135135
h1 {
136136
font-size: 35px;
@@ -143,7 +143,7 @@ const Banner2SectionWrapper = styled.section`
143143
content: none;
144144
}
145145
}
146-
}
146+
}
147147
@media screen and (max-width: 402px) {
148148
.banner-btn.one, .banner-btn.two
149149
{

src/sections/Home/Banner-4/banner4.style.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,12 @@ const Banner1SectionWrapper = styled.section`
221221
}
222222
}
223223
@media only screen and (max-width: 767px) {
224+
min-height: 320px;
225+
padding: 1.2rem 0 1.5rem 0;
226+
.video-wrapper {
227+
width: 100%;
228+
padding-bottom: 56.25%; /* Maintain 16:9 aspect ratio */
229+
}
224230
.section-title-wrapper {
225231
min-width: 100%;
226232
}
@@ -251,6 +257,12 @@ const Banner1SectionWrapper = styled.section`
251257
}
252258
}
253259
@media only screen and (max-width: 480px) {
260+
min-height: 180px;
261+
padding: 0.7rem 0 1rem 0;
262+
.video-wrapper {
263+
width: 100%;
264+
padding-bottom: 60%;
265+
}
254266
padding: 2rem 0;
255267
.vintage-box{
256268
&:before{

src/sections/Pricing/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const Pricing = () => {
107107
<div className="headers">
108108
<h1 className="header-heading">Plans For Every Team Size</h1>
109109

110-
<div style={{ display: "flex", "gap": "1rem", alignItems: "center", "justifyContent": "flex-end", width: "85%" }} >
110+
<div className="header-controls" style={{ display: "flex", "gap": "1rem", alignItems: "center", "justifyContent": "flex-end", width: "85%" }} >
111111
<CurrencySelect currency={currency} setCurrency={setCurrency} />
112112

113113
<Box sx={customToggleButtonStyles.container}>

src/sections/Pricing/pricing.style.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ const PricingWrapper = styled.section`
2020
@media (min-width: 2048px) {
2121
height: 30rem;
2222
}
23+
2324
h1{
2425
margin-top: -2rem;
2526
}
2627
28+
2729
.header-svg {
2830
position: absolute;
2931
bottom: 0;
@@ -35,7 +37,21 @@ const PricingWrapper = styled.section`
3537
color: white;
3638
text-align: center;
3739
}
38-
}
40+
41+
@media (max-width: 383px){
42+
height:27rem;
43+
44+
.header-controls{
45+
flex-direction: column;
46+
gap: 0rem;
47+
}
48+
49+
h1 {
50+
margin-bottom: 1rem;
51+
}
52+
}
53+
54+
}
3955
4056
.toggle-container {
4157
display: flex;
@@ -45,6 +61,11 @@ const PricingWrapper = styled.section`
4561
font-size: .9rem;
4662
gap: 10px;
4763
width: auto;
64+
65+
@media (max-width: 383px){
66+
margin-top: 0rem;
67+
}
68+
4869
}
4970
5071
.toggle {

0 commit comments

Comments
 (0)