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

Nav Padding fix #63

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Nav Padding fix #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aceebd
fixed padding on nav
eonflower Apr 5, 2024
d93ed78
updated nav padding
eonflower Apr 5, 2024
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
8 changes: 4 additions & 4 deletions src/components/NavigationBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ export default function NavigationBar({ data, setListPath, setLoading }) {
{/* The user's lists display when the user's uid matches the uid contained in the listPath of a shopping list.*/}
{openFormModal ? (
<Modal isOpen={openFormModal} onClose={closeModal}>
<div className="flex flex-col gap-4 p-4">
<div className="flex flex-col gap-4 p-2">
<AddList setListPath={setListPath} />
</div>
</Modal>
) : (
<div className={`flex-col ${sidebarWidth} `}>
<div className={`flex-col ${sidebarWidth}`}>
<div
className={`flex min-h-12 xsm:h-[30vh] sm:h-[35vh] pt-2 pb-4 ${sidebarWidth}`}
>
Expand All @@ -147,7 +147,7 @@ export default function NavigationBar({ data, setListPath, setLoading }) {
user?.uid,
) ? (
<ul
className={`${sidebarWidth} gap-6 text-sm text-left overflow-auto`}
className={`${sidebarWidth} gap-6 text-sm text-left px-2 overflow-auto`}
>
{' '}
{data.map((list) => (
Expand Down Expand Up @@ -205,7 +205,7 @@ export default function NavigationBar({ data, setListPath, setLoading }) {
) !== user?.uid,
) ? (
<ul
className={`${sidebarWidth} gap-6 text-sm font-family: Inter font-medium leading-4 text-left rounded-lg min-h-12 overflow-auto`}
className={`${sidebarWidth} gap-6 text-sm px-2 text-left rounded-lg min-h-12 overflow-y-auto`}
>
{' '}
{data.map((list) => (
Expand Down
2 changes: 1 addition & 1 deletion src/components/NavigationBarSingleList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function NavigationBarSingleList({

return (
<li
className={`flex-grow justify-between px-6 h-12 bg-list rounded-lg shadow-sm mt-4 hover:bg-[#ebf5ff] hover:bg-opacity-85 ${windowLocationListPath && localStorageListName === name ? 'bg-[#ebf5ff] bg-opacity-85' : null}`}
className={`flex-grow justify-between xsm:px-4 sm:px-2 h-12 bg-list rounded-lg shadow-sm mt-4 hover:bg-[#ebf5ff] hover:bg-opacity-85 ${windowLocationListPath && localStorageListName === name ? 'bg-[#ebf5ff] bg-opacity-85' : null}`}
>
{/*The above hex code (#ebf5ff) only worked in the ternary operator in lowercase format, not uppercase.*/}
{/* Using Link instead of button */}
Expand Down
Loading