Skip to content

Commit d5ee48a

Browse files
Add active class
1 parent 560507e commit d5ee48a

File tree

5 files changed

+78
-7
lines changed

5 files changed

+78
-7
lines changed

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@testing-library/react": "^9.5.0",
1212
"@testing-library/user-event": "^7.2.1",
1313
"axios": "^0.19.2",
14+
"classnames": "^2.2.6",
1415
"react": "^16.13.1",
1516
"react-dom": "^16.13.1",
1617
"react-scripts": "3.4.1"

src/components/CovidApp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const styles = {
1212
navBar: {
1313
flex: "0 0 10%",
1414
backgroundColor: colors.darkPurple,
15-
color: "#ffffff",
15+
color: "rgba(255,255,255,.9)",
1616
textTransform: "capitalize",
1717
display: "flex",
1818
justifyContent: "center",

src/components/Navbar.js

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
import React, { Component } from "react";
22
import { withStyles } from "@material-ui/styles";
3+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
4+
import {
5+
faHome,
6+
faHeadSideCough,
7+
faFlask,
8+
faQuestionCircle,
9+
} from "@fortawesome/free-solid-svg-icons";
10+
import colors from "../colors";
11+
import classNames from "classnames";
312

413
const styles = {
514
nav: {
@@ -9,21 +18,76 @@ const styles = {
918
listStyle: "none",
1019
},
1120
navLinks: {
12-
marginBottom: "7rem",
21+
marginBottom: "5rem",
1322
fontWeight: "500",
1423
},
24+
iconBox: {
25+
display: "flex",
26+
flexDirection: "column",
27+
justifyContent: "center",
28+
alignItems: "center",
29+
position: "relative",
30+
zIndex: "50",
31+
},
32+
icons: {
33+
fontSize: "2.5rem",
34+
padding: "1rem 0",
35+
},
36+
active: {
37+
color: colors.purple,
38+
position: "relative",
39+
zIndex: "10",
40+
41+
"&::before": {
42+
content: '""',
43+
position: "absolute",
44+
width: "165%",
45+
height: "110%",
46+
display: "block",
47+
backgroundColor: "rgb(245, 245, 245)",
48+
transform: "translateX(-1rem) skewX(10deg)",
49+
borderRadius: "25px",
50+
},
51+
},
1552
};
1653

1754
class Navbar extends Component {
1855
render() {
1956
const { classes } = this.props;
57+
const activeClasses = classNames(classes.navLinks, classes.active);
2058
return (
2159
<nav className={classes.nav}>
2260
<ul className={classes.navItems}>
23-
<li className={classes.navLinks}>Overview</li>
24-
<li className={classes.navLinks}>Symptoms</li>
25-
<li className={classes.navLinks}>Test Yourself</li>
26-
<li className={classes.navLinks}>Help</li>
61+
<li className={activeClasses}>
62+
<div className={classes.iconBox}>
63+
<FontAwesomeIcon icon={faHome} className={classes.icons} />
64+
Overview
65+
</div>
66+
</li>
67+
<li className={classes.navLinks}>
68+
<div className={classes.iconBox}>
69+
<FontAwesomeIcon
70+
icon={faHeadSideCough}
71+
className={classes.icons}
72+
/>
73+
Symptoms
74+
</div>
75+
</li>
76+
<li className={classes.navLinks}>
77+
<div className={classes.iconBox}>
78+
<FontAwesomeIcon icon={faFlask} className={classes.icons} />
79+
Test Yourself
80+
</div>
81+
</li>
82+
<li className={classes.navLinks}>
83+
<div className={classes.iconBox}>
84+
<FontAwesomeIcon
85+
icon={faQuestionCircle}
86+
className={classes.icons}
87+
/>
88+
Help
89+
</div>
90+
</li>
2791
</ul>
2892
</nav>
2993
);

src/index.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ body {
2121
font-size: 1.6rem;
2222
line-height: 1.7;
2323
color: #1A1053;
24-
background-color: rgba(185, 185, 185, 0.281);
24+
background-color: rgb(245, 245, 245);
25+
/* background-color: rgba(185, 185, 185, 0.281); */
2526
}
2627

2728
code {

0 commit comments

Comments
 (0)