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

Jump to bottom

fix: bottom nav #1167

Merged
merged 1 commit into from
Dec 4, 2023
Merged

fix: bottom nav #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/web/src/components/Bangers/RenderBanger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import RenderLink from './RenderLink'

const RenderBanger = ({ post }: { post: PrimaryPublication }) => {
return (
<div className="ultrawide:space-y-8 tape-border hover:bg-gallery/50 hover:dark:bg-smoke space-y-6 !border-x-0 !border-t-0 p-5">
<div className="ultrawide:space-y-8 tape-border hover:bg-gallery/50 hover:dark:bg-smoke space-y-6 !border-x-0 !border-t-0 p-2 md:p-5">
<div className="space-y-4">
<div className="space-y-3">
<div className="flex items-center justify-between">
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/Common/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ import Navbar from './Navbar'
interface Props {
children: ReactNode
skipNav?: boolean
skipBottomNav?: boolean
skipPadding?: boolean
}

const Layout: FC<Props> = ({ children, skipNav, skipPadding }) => {
const Layout: FC<Props> = ({
children,
skipNav,
skipBottomNav,
skipPadding
}) => {
const { setLensHubOnchainSigNonce } = useNonceStore()
const activeProfile = useProfileStore((state) => state.activeProfile)
const setActiveProfile = useProfileStore((state) => state.setActiveProfile)
Expand Down Expand Up @@ -131,7 +137,7 @@ const Layout: FC<Props> = ({ children, skipNav, skipPadding }) => {
>
{children}
</div>
<MobileBottomNav />
{!skipBottomNav && <MobileBottomNav />}
</>
)
}
Expand Down
6 changes: 4 additions & 2 deletions apps/web/src/components/Common/Providers/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const Web3Provider = dynamic(() => import('./Web3Provider'))
const GlobalDialogs = dynamic(() => import('../GlobalDialogs'))
const Layout = dynamic(() => import('../Layout'))

const NO_NAV_PATHS = ['/login']
const NO_TOP_NAV_PATHS = ['/login']
const NO_BOTTOM_NAV_PATHS = ['/bangers']
const NO_PADDING_PATHS = [
'/u/[[...handle]]',
'/bangers',
Expand Down Expand Up @@ -47,7 +48,8 @@ const Providers = ({ children }: { children: ReactNode }) => {
<GlobalDialogs />
<LivepeerConfig client={livepeerClient} theme={videoPlayerTheme}>
<Layout
skipNav={NO_NAV_PATHS.includes(pathname)}
skipNav={NO_TOP_NAV_PATHS.includes(pathname)}
skipBottomNav={NO_BOTTOM_NAV_PATHS.includes(pathname)}
skipPadding={NO_PADDING_PATHS.includes(pathname)}
>
{children}
Expand Down