Skip to content

Commit

Permalink
Index css
Browse files Browse the repository at this point in the history
Changes to be committed:
	modified:   client/src/index.html
	modified:   client/src/layouts/MainNavBar.js
	modified:   client/src/layouts/ObjectNavBar.js
  • Loading branch information
HadleyKing committed Dec 19, 2023
1 parent 9e92d5f commit afa323d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
1 change: 1 addition & 0 deletions client/src/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="App.css">
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
Expand Down
15 changes: 10 additions & 5 deletions client/src/layouts/MainNavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const NavBar = () => {
>
<MenuItem component={Link} to='/'>
<IconButton aria-label='go home' color='inherit'>
<Badge overlap="rectangular" badgeContent={0} color='secondary'>
<Badge className="white-icon hover-background" overlap="rectangular" badgeContent={0}>
<HomeIcon />
</Badge>
</IconButton>
Expand Down Expand Up @@ -181,8 +181,8 @@ const NavBar = () => {
<Tooltip title="Help">
<><HelpDropDown /></>
</Tooltip>
<Tooltip title="About BCO">
<IconButton component={Link} to='/about' aria-label='show 0 new notifications' color='inherit'>
<Tooltip title="About Us">
<IconButton component={Link} to='/about' aria-label='show 0 new notifications' className="nav-link">
<Badge overlap="rectangular" badgeContent={0} color='secondary'>
<InfoOutlinedIcon />
</Badge>
Expand Down Expand Up @@ -210,7 +210,12 @@ const NavBar = () => {
</>
) : (
<>
<IconButton component={Link} to='/login' aria-label='log in' color='inherit'>
<IconButton
component={Link}
to='/login'
aria-label='log in'
className="nav-link"
>
<Typography variant='h6' component='h6'>
Log in
</Typography>
Expand All @@ -225,7 +230,7 @@ const NavBar = () => {
aria-controls={mobileMenuId}
aria-haspopup='true'
onClick={handleMobileMenuOpen}
color='inherit'
className="nav-link"
>
<MoreIcon />
</IconButton>
Expand Down
6 changes: 2 additions & 4 deletions client/src/layouts/ObjectNavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,8 @@ const ObjectNavBar = () => {
<><HelpDropDown /></>
</Tooltip>
{auth.user ? (

<Tooltip title="Profile Page">
<IconButton
<><IconButton
component={Link} to='/profile'
edge='end'
aria-label='account of current user'
Expand All @@ -272,9 +271,8 @@ const ObjectNavBar = () => {
: (<div>{auth.user.userinfo.username}</div>)
}
</div>
</IconButton>
</IconButton></>
</Tooltip>

) : (
<>
<IconButton component={Link} to='/login' aria-label='log in' color='inherit'>
Expand Down

0 comments on commit afa323d

Please sign in to comment.