Skip to content

fix: restore pull-to-refresh while maintaining overscroll bounce prevention of page #528

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

Merged
merged 1 commit into from
Nov 11, 2025
Merged

fix: restore pull-to-refresh while maintaining overscroll bounce prevention of page #528

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
7 changes: 4 additions & 3 deletions src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export function Navbar({ children }: { children: React.ReactNode }) {
const navbar = (
<div
className={twMerge(
'w-full p-2 sticky top-0 z-[100] bg-white/70 dark:bg-black/70 backdrop-blur-lg shadow-xl shadow-black/3',
'w-full p-2 fixed top-0 z-[100] bg-white/70 dark:bg-black/70 backdrop-blur-lg shadow-xl shadow-black/3',
'flex items-center justify-between gap-4',
'dark:border-b border-gray-500/20'
)}
Expand Down Expand Up @@ -464,7 +464,7 @@ export function Navbar({ children }: { children: React.ReactNode }) {
const smallMenu = showMenu ? (
<div
className="lg:hidden bg-white/50 dark:bg-black/60 backdrop-blur-[20px] z-50
sticky top-[var(--navbar-height)] max-h-[calc(100dvh-var(--navbar-height))] overflow-y-auto
fixed top-[var(--navbar-height)] left-0 right-0 max-h-[calc(100dvh-var(--navbar-height))] overflow-y-auto
"
>
<div
Expand Down Expand Up @@ -535,7 +535,8 @@ export function Navbar({ children }: { children: React.ReactNode }) {
<div
className={twMerge(
`min-h-[calc(100dvh-var(--navbar-height))] flex flex-col
min-w-0 lg:flex-row w-full transition-all duration-300`
min-w-0 lg:flex-row w-full transition-all duration-300
pt-[var(--navbar-height)]`
)}
>
{smallMenu}
Expand Down
3 changes: 1 addition & 2 deletions src/styles/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@plugin "@tailwindcss/typography";

@custom-variant dark (&:is(.dark *));
@custom-variant dark (&:is(.dark, .dark *));
@custom-variant light (&:is(.light, .light *));
@custom-variant auto (&:is(.auto, .auto *));
@custom-variant aria-current (&[aria-current="location"]);
Expand Down Expand Up @@ -68,7 +68,6 @@ button {
html,
body {
@apply text-gray-900 bg-gray-50 dark:bg-gray-900 dark:text-gray-200;
overscroll-behavior: none;
}

.using-mouse * {
Expand Down
Loading