Skip to content

Commit 50f63a1

Browse files
committed
activity using media queries
1 parent f8401e2 commit 50f63a1

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

src/user/Activity/Activity.js

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,27 @@ class Activity extends Component {
6565
<div className="main_section">
6666
<div className="left_nav">
6767
<p className="header_text">Community Settings</p>
68-
<Desktop>
68+
<div className="left_nav_container">
6969
<LeftNav
70-
data={{
71-
option: this.state.option,
72-
changeOption: this.changeOption.bind(this),
73-
}}
74-
/>
75-
</Desktop>
76-
<Mobile>
77-
<Accordion>
78-
<Accordion.Toggle onClick={() => toggleSidebar()} variant="outline-secondary" size="sm" as={Button} eventKey="0">
79-
{this.state.sidebarOpen?"Close Menu":"Setting Menu"}
80-
</Accordion.Toggle>
81-
<Accordion.Collapse eventKey="0">
82-
<LeftNav
83-
data={{
84-
option: this.state.option,
85-
changeOption: this.changeOption.bind(this),
86-
}}
87-
/>
88-
</Accordion.Collapse>
89-
</Accordion>
90-
</Mobile>
70+
data={{
71+
option: this.state.option,
72+
changeOption: this.changeOption.bind(this),
73+
}}
74+
/>
75+
</div>
76+
<Accordion className="activity_accordion">
77+
<Accordion.Toggle onClick={() => toggleSidebar()} variant="outline-secondary" size="sm" as={Button} eventKey="0">
78+
{this.state.sidebarOpen?"Close Menu":"Setting Menu"}
79+
</Accordion.Toggle>
80+
<Accordion.Collapse eventKey="0">
81+
<LeftNav
82+
data={{
83+
option: this.state.option,
84+
changeOption: this.changeOption.bind(this),
85+
}}
86+
/>
87+
</Accordion.Collapse>
88+
</Accordion>
9189
</div>
9290
<div className="right_section">
9391
{view === "profile" ? <OrgProfile /> : null}

src/user/Activity/activity.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
}
6161
}
6262
// mobile
63+
.activity_accordion {
64+
display: none;
65+
}
66+
6367
@media screen and (max-width: 768px) {
6468
.main_section {
6569
width: 100%;
@@ -70,6 +74,12 @@
7074
width: 100%;
7175
max-width: 100%;
7276
margin: 10px auto;
77+
.activity_accordion {
78+
display: block;
79+
}
80+
.left_nav_container {
81+
display: none;
82+
}
7383
.navigation {
7484
.list-group {
7585
.link {
@@ -96,6 +106,12 @@
96106
width: 100%;
97107
max-width: 100%;
98108
margin: 10px auto;
109+
.activity_accordion {
110+
display: block;
111+
}
112+
.left_nav_container {
113+
display: none;
114+
}
99115
.navigation {
100116
.list-group {
101117
.link {

0 commit comments

Comments
 (0)