Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1127-nav-hoverContrast change hover to red #1148

Merged
merged 4 commits into from
May 6, 2022
Merged

1127-nav-hoverContrast change hover to red #1148

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76cd95d
1127-nav-hoverContrast change hover to red
ezhou0 Oct 26, 2021
10d9276
add underline to active page in Nav
ezhou0 Dec 7, 2021
231dc85
header change
ezhou0 Dec 19, 2021
f8c6146
Merge branch 'dev' into 1127-nav-hoverContrast
nichhk May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions client/components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { NavLink, Link } from 'react-router-dom';
import { makeStyles } from '@material-ui/core/styles';
import {
AppBar,
Expand Down Expand Up @@ -34,8 +34,13 @@ const useStyles = makeStyles(theme => ({
fontWeight: 'bold',
letterSpacing: '4px',
},

}));

const activeStyle = {
borderBottom: `1px solid yellow`
};

// TODO: links/routing, mobile
const Header = () => {
const classes = useStyles();
Expand All @@ -53,11 +58,11 @@ const Header = () => {
<AppBar position="static" className={classes.appBar}>
<Toolbar>
<Typography variant="h1" className={classes.title}>
<Link to="/" className={classes.link}>311DATA</Link>
<Link to="/" className={classes.link} >311DATA</Link>
</Typography>
<Link className={classes.link} to="/map">
<NavLink className={classes.link} to="/map" activeStyle = {activeStyle}>
<Button className={classes.button}>Map</Button>
</Link>
</NavLink>
<Button
id="report-anchor"
onClick={handleClick}
Expand Down Expand Up @@ -103,18 +108,18 @@ const Header = () => {
</MenuItem>
</Link>
</Menu>
<Link to="/faqs" className={classes.link}>
<NavLink to="/faqs" className={classes.link} activeStyle = {activeStyle}>
<Button className={classes.button}>FAQ</Button>
</Link>
<Link to="/blog" className={classes.link}>
</NavLink>
<NavLink to="/blog" className={classes.link} activeStyle = {activeStyle}>
<Button className={classes.button}>Blog</Button>
</Link>
<Link to="/privacy" className={classes.link}>
</NavLink>
<NavLink to="/privacy" className={classes.link} activeStyle = {activeStyle}>
<Button className={classes.button}>Privacy</Button>
</Link>
<Link to="/contact" className={classes.link}>
</NavLink>
<NavLink to="/contact" className={classes.link} activeStyle = {activeStyle}>
<Button className={classes.button}>Contact</Button>
</Link>
</NavLink>
</Toolbar>
</AppBar>
);
Expand Down
Loading