Skip to content

Commit 609f347

Browse files
committed
Account Settings Mobile and Tab Responsive Fix
1 parent 2e8e8f5 commit 609f347

File tree

3 files changed

+45
-22
lines changed

3 files changed

+45
-22
lines changed

src/user/dashboard/settings/Settings.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ class Settings extends Component {
1212
}
1313
render() {
1414
return (
15-
<div className="settings">
16-
<div className="navigation">
17-
<Navigation settings={this.state.settings}></Navigation>
15+
<>
16+
<Navigation settings={this.state.settings}></Navigation>
17+
<div className="settings">
18+
<div className="settings__content">
19+
<SettingContent />
20+
</div>
1821
</div>
19-
<div className="settings-content">
20-
<SettingContent />
21-
</div>
22-
</div>
22+
</>
2323
)
2424
}
2525
}

src/user/dashboard/settings/styles/SettingSidebar.scss

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
.settings__right__container {
22
display: flex;
33
.settings__left__nav {
4-
max-width: 17%;
5-
height: 50%;
64
margin-top: 38px;
75
margin-left: 10px;
86
}
@@ -26,6 +24,7 @@
2624
.right__setting__option__content {
2725
width: 56vw;
2826
.deactivate___settings__btn {
27+
border-radius: 100px;
2928
&:hover {
3029
background-color: #ffffff;
3130
}
@@ -40,4 +39,30 @@
4039
}
4140
}
4241
}
43-
}
42+
}
43+
44+
@media (min-width: 320px) and (max-width: 1024px){
45+
.settings__right__container {
46+
flex-flow: column;
47+
padding: 2.5vh 2.5vw;
48+
.settings__left__nav {
49+
flex: 1;
50+
margin: 0;
51+
padding: 0;
52+
}
53+
.settings__right__content {
54+
flex: 3;
55+
margin: 4vh 0;
56+
padding: 0;
57+
width: 100%;
58+
max-width: 100%;
59+
.right__setting__option__content {
60+
width: 100%;
61+
.row {
62+
margin: 0;
63+
padding: 0;
64+
}
65+
}
66+
}
67+
}
68+
}

src/user/dashboard/settings/styles/settings.scss

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,23 @@
44
height: auto;
55
font-family: Muli, sans-serif;
66

7-
.navigation {
8-
background: #f5f5f5;
9-
flex-grow: 1;
10-
border-right: solid 1px #dfe9f1;
11-
position: fixed;
12-
top: 0px;
13-
bottom: 0px;
14-
left: 0px;
15-
overflow-y: scroll;
16-
}
17-
.setting-sidebar {
7+
.setting__sidebar {
188
border-left: solid 1px #dfe9f1;
199
}
2010

21-
.settings-content {
11+
.settings__content {
2212
flex: 3;
2313
margin-left: 13vw;
2414
}
2515
.options {
2616
color: rgba(0, 0, 0, 0.5);
2717
}
2818
}
19+
20+
@media (min-width: 320px) and (max-width: 1024px){
21+
.settings {
22+
.settings__content {
23+
margin-left: 0;
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)