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

TopNavBar adjustments #183 #275

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

TopNavBar adjustments #183 #275

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d62e60d
adjusted logo alignment
agrawalashita Jan 17, 2025
a85a5c7
adjusted donate button position in mobile view
agrawalashita Jan 18, 2025
3ae0943
pushed donate button back to bottom
agrawalashita Jan 22, 2025
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
110 changes: 59 additions & 51 deletions app/components/top-nav-bar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,57 +128,57 @@ const TopNavBar = props => {

{/* This is the mobile menu */}
{isExpanded ? (
<menu className={cx(classes.mobileMenuContainer)}>
{menu &&
menu.map((item, index) =>
Array.isArray(item) ? (
<li className={classes.menuList}>
<div
className={cx(classes.mobileMenuGroup, classes.colors, {
[classes.selectedItem]: selectedItem === item[0].name,
})}
key={index}
onClick={() => handleMobileMenuGroupClick(item, index)}
>
{item[0].name} {'\u25BE'}
{openDropdown === index && (
<div className={classes.mobileDropdownMenu}>
{item.slice(1).map((subItem, subIndex) => (
<button
key={subIndex}
className={cx(classes.mobileMenuItem, classes.colors, {
[classes.selectedItem]: selectedItem === subItem.name,
})}
onClick={event => {
event.stopPropagation()
handleMenuItemClick(subItem)
}}
>
{subItem.name}
</button>
))}
</div>
)}
</div>
</li>
) : (
<li className={classes.menuList}>
<div
key={item.name}
className={cx(classes.mobileMenuItem, classes.colors, {
[classes.selectedItem]: selectedItem === item.name,
})}
onClick={() => handleMenuItemClick(item)}
>
{item.name}
</div>
</li>
)
)}
<menu className={cx(classes.mobileMenuContainer)}>
{menu &&
menu.map((item, index) =>
Array.isArray(item) ? (
<li className={classes.menuList}>
<div
className={cx(classes.mobileMenuGroup, classes.colors, {
[classes.selectedItem]: selectedItem === item[0].name,
})}
key={index}
onClick={() => handleMobileMenuGroupClick(item, index)}
>
{item[0].name} {'\u25BE'}
{openDropdown === index && (
<div className={classes.mobileDropdownMenu}>
{item.slice(1).map((subItem, subIndex) => (
<button
key={subIndex}
className={cx(classes.mobileMenuItem, classes.colors, {
[classes.selectedItem]: selectedItem === subItem.name,
})}
onClick={event => {
event.stopPropagation()
handleMenuItemClick(subItem)
}}
>
{subItem.name}
</button>
))}
</div>
)}
</div>
</li>
) : (
<li className={classes.menuList}>
<div
key={item.name}
className={cx(classes.mobileMenuItem, classes.colors, {
[classes.selectedItem]: selectedItem === item.name,
})}
onClick={() => handleMenuItemClick(item)}
>
{item.name}
</div>
</li>
)
)}
<div className={classes.mobileDonate}>
<Donate />
<Donate />
</div>
</menu>
</menu>
) : null}
</div>
</div>
Expand Down Expand Up @@ -237,7 +237,7 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
padding: '0 0 0 1rem',
},
mobileDonate: {
padding: '0 0 0.5rem 0',
padding: '0.5rem',
},
navBarContainer: {
width: '80%',
Expand All @@ -250,7 +250,7 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
logo: {
width: '8.5rem',
height: 'auto',
paddingBottom: '1.5rem',
paddingBottom: '0rem',
[`@media (max-width: ${theme.condensedWidthBreakPoint})`]: {
width: '4rem',
},
Expand All @@ -268,6 +268,14 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
display: 'none',
},
},
// mobileContainers: props => ({
// display: 'flex',
// justifyContent: 'space-between',
// width: '90%',
// [`@media (min-width: ${theme.condensedWidthBreakPoint})`]: {
// display: 'none',
// },
// }),
mobileMenuContainer: props => ({
padding: '1.25rem 1.25rem',
display: 'flex',
Expand Down