Skip to content

Commit 47ad5a8

Browse files
authored
Merge branch 'master' into fix_dropdown_functionality
2 parents 15d5d54 + 631d62c commit 47ad5a8

File tree

4 files changed

+32
-9
lines changed

4 files changed

+32
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const MemberSingle = ({ frontmatter }) => {
4646
<MemberSingleWrapper>
4747
<Container>
4848
<div>
49-
<Row>
49+
<Row className="profile-header" >
5050
<Col xs={12} sm={12} lg={6}>
5151
<div className="backBtn">
5252
<Link to="/community/members">
@@ -59,8 +59,8 @@ const MemberSingle = ({ frontmatter }) => {
5959
<h1 className="page-heading">Layer5 Community Member</h1>
6060
</Col>
6161
</Row>
62-
<Row>
63-
<Col $xs={12} $sm={12} $lg={6}>
62+
<Row className="member-details">
63+
<Col $xs={12} $sm={12} $lg={6} className="profile-image-col">
6464
<Image
6565
className={
6666
status.includes("Inactive")
@@ -77,7 +77,7 @@ const MemberSingle = ({ frontmatter }) => {
7777
<div className="name">{name}</div>
7878
{position && <div className="position">{position}</div>}
7979
</div>
80-
<div className="body">
80+
<div className="info-body">
8181
{location && (
8282
<div className="text location">
8383
<span className="bold">{location}</span>

src/sections/Community/Member-single/memberSingle.style.js

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,27 @@ import styled from "styled-components";
22

33
export const MemberSingleWrapper = styled.div`
44
margin: 4.5rem 0 3.125rem 0;
5+
6+
@media screen and (max-width: 62.5rem) {
7+
margin: 1rem 0 3.125rem 0;
8+
9+
.profile-header {
10+
flex-direction: column;
11+
margin-bottom: 1.5rem;
12+
}
13+
14+
.profile-image-col {
15+
text-align: center;
16+
}
17+
18+
.member-details {
19+
flex-wrap: wrap;
20+
}
21+
}
22+
523
.backBtn {
624
font-weight: 600;
725
margin-bottom: 1rem;
8-
@media screen and (max-width: 62rem) {
9-
display: none;
10-
}
1126
a {
1227
display: flex;
1328
color: ${(props) => props.theme.primaryColor};
@@ -32,6 +47,10 @@ export const MemberSingleWrapper = styled.div`
3247
color: ${(props) => props.theme.primaryColor};
3348
text-align: left;
3449
font-weight: 400;
50+
51+
@media screen and (max-width: 62.5rem) {
52+
text-align: center;
53+
}
3554
}
3655
ul {
3756
list-style: none;
@@ -41,7 +60,7 @@ export const MemberSingleWrapper = styled.div`
4160
transition: 0.9s;
4261
}
4362
44-
.body {
63+
.info-body {
4564
display: block;
4665
position: relative;
4766
text-align: center;

src/sections/General/Navigation/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ const Navigation = () => {
326326
changeDropdownState();
327327
closeDropDown();
328328
}}
329-
className="mobile-sub-menu-item"
329+
className={subItems.sepLine ? "mobile-sub-menu-item" : "mobile-nested-menu"}
330330
activeClassName="nav-link-active"
331331
>
332332
{subItems.name}

src/sections/General/Navigation/navigation.style.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,10 @@ const NavigationWrap = styled.header`
648648
.mobile-sub-menu-item {
649649
font-size: 1.1rem;
650650
}
651+
.mobile-nested-menu {
652+
font-size: 1.1rem;
653+
margin-left: 1rem;
654+
}
651655
}
652656
653657
.nav-link-active {

0 commit comments

Comments
 (0)