Skip to content

Commit 8a10b02

Browse files
committed
Fixes #565
1 parent 1e3cd50 commit 8a10b02

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/user/dashboard/navigation/navigation.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ class Navigation extends Component {
3131
render() {
3232
const ListItem = (props) => {
3333
const item = props.isMobile ? (
34-
<ListGroup.Item className={props.className}>
35-
<NavLink to={props.link} className="link">
34+
<NavLink to={props.link} className="link">
35+
<ListGroup.Item className={props.className}>
3636
<SVGIcon name={props.name} isMobile={true} />
37-
</NavLink>
38-
</ListGroup.Item>
37+
</ListGroup.Item>
38+
</NavLink>
3939
) : (
40-
<ListGroup.Item className={props.className}>
41-
<SVGIcon name={props.name} />
42-
<NavLink to={props.link} className="link">
40+
<NavLink to={props.link} className="link">
41+
<ListGroup.Item className={props.className}>
42+
<SVGIcon name={props.name} />
4343
<b>{props.name}</b>
44-
</NavLink>
45-
</ListGroup.Item>
44+
</ListGroup.Item>
45+
</NavLink>
4646
);
4747

4848
return item;

src/user/dashboard/navigation/navigation.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525

2626
.main-navigation {
2727
.list-group {
28-
.active {
28+
.link {
2929
background-color: rgba(26, 115, 232, 0.1);
30-
.link {
30+
.active {
3131
color: #1a73e8;
3232
background-color: transparent;
3333
}
3434
}
3535
span {
36-
.active {
36+
.link {
3737
background-color: rgba(26, 115, 232, 0.1);
38-
.link {
38+
.active {
3939
color: #1a73e8;
4040
background-color: transparent;
4141
}
@@ -46,15 +46,15 @@
4646

4747
.main-navigation {
4848
.list-group {
49-
.inactive {
50-
.link {
49+
.link {
50+
.inactive {
5151
color: rgba(0, 0, 0, 0.5);
5252
}
5353
}
5454
span {
55-
.active {
56-
background-color: rgba(26, 115, 232, 0.1);
57-
.link {
55+
.link {
56+
.active {
57+
background-color: rgba(26, 115, 232, 0.1);
5858
color: #1a73e8;
5959
background-color: transparent;
6060
}

0 commit comments

Comments
 (0)