Skip to content

Commit

Permalink
Website Redesign: Release 1 navigation bars #127
Browse files Browse the repository at this point in the history
* Disabled hover effect over 'Notify Me' and 'Support' buttons
* Updated useIsMobile breakpoint from 'sm' to 'lg' because the 'Notify Me'and 'Support' buttons will cause overflow when breakpoint is 'sm'
* Inverted the X and github icons color
  • Loading branch information
yyu233 committed Jan 15, 2024
1 parent 4e58efb commit 8db193c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 19 deletions.
Binary file added public/images/github_invert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/x_invert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import Image from 'next/image'
import Link from 'next/link'

import facebooklogo from '../../public/images/facebook.png'
import githublogo from '../../public/images/github.png'
import githublogo from '../../public/images/github_invert.png'
import instagramlogo from '../../public/images/instagram.png'
import linkedinlogo from '../../public/images/linkedin.png'
import licenselogo from '../../public/images/orcasound-all-rights-reserved-2023.png'
import orcasoundlogo from '../../public/images/orcasoundlogo_3.png'
import xlogo from '../../public/images/x.png'
import xlogo from '../../public/images/x_invert.png'
import youtubelogo from '../../public/images/youtube.png'
import useIsMobile from '../utils/useIsMobile'

Expand Down
20 changes: 4 additions & 16 deletions src/components/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function Mobile() {
)

return (
<Box sx={{ display: { xs: 'flex', sm: 'none' } }}>
<Box sx={{ display: { xs: 'flex', sm: 'flex' } }}>
<IconButton
size="large"
aria-label="account of current user"
Expand All @@ -151,7 +151,7 @@ function Mobile() {
anchor="top"
open={menuIsOpen}
onClose={handleMenuToggle}
sx={{ display: { xs: 'flex', sm: 'none' } }}
sx={{ display: { xs: 'flex', sm: 'flex' } }}
>
<Toolbar sx={{ height: '80px' }} />
{list}
Expand All @@ -172,12 +172,6 @@ function Desktop() {
sx={{
position: 'relative',
margin: 3,
'&:hover .MuiButtonBase-root .MuiTypography-root': {
//color: 'grey',
},
'&:hover .MuiBox-root': {
opacity: 1,
},
}}
>
<Button
Expand Down Expand Up @@ -216,16 +210,13 @@ function Desktop() {
borderColor: 'white',
borderStyle: 'solid',
borderRadius: '100px',
display: { xs: 'none', sm: 'flex' },
textTransform: 'none',
width: 150,
'&:hover': { color: 'black', backgroundColor: 'white' },
maxwidth: 150,
}}
startIcon={
<NotificationsIcon
sx={{
color: 'white',
'&:hover': { color: `${theme.palette.secondary.main}` },
}}
/>
}
Expand All @@ -241,11 +232,8 @@ function Desktop() {
borderColor: 'white',
borderStyle: 'solid',
borderRadius: '100px',
display: { xs: 'none', sm: 'flex' },
textTransform: 'none',
width: 150,
'&:hover': { color: 'black', backgroundColor: 'white' },
'&:hover .MuiSvgIcon-root': { color: 'black' },
maxwidth: 150,
}}
startIcon={
<VolunteerActivismIcon
Expand Down
2 changes: 1 addition & 1 deletion src/utils/useIsMobile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default function useIsMobile() {
// Negate media query so that default SSR value for media query (false) shows
// up as being mobile. In other words, if the media query fails, assume the
// client is mobile and render for mobile first
return !useMediaQuery<Theme>((theme) => theme.breakpoints.up('sm'))
return !useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
}

0 comments on commit 8db193c

Please sign in to comment.