diff --git a/app/global.css b/app/global.css index 1749a8ac..dcc497ca 100644 --- a/app/global.css +++ b/app/global.css @@ -58,14 +58,6 @@ html { scroll-behavior: smooth; } -html .font-zen { - font-family: var(--font-zen); -} - -html .font-inter { - font-family: var(--font-inter); -} - body { height: auto; min-height: 100%; diff --git a/app/layout.tsx b/app/layout.tsx index fedc5ec5..3dc3a60a 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -25,10 +25,10 @@ initAnalytics(); export default function RootLayout({ children }: { children: React.ReactNode }) { return ( - + {/* - + */} {children} diff --git a/app/positions/components/PositionsContent.tsx b/app/positions/components/PositionsContent.tsx index 2f0c99f8..712268c8 100644 --- a/app/positions/components/PositionsContent.tsx +++ b/app/positions/components/PositionsContent.tsx @@ -80,7 +80,7 @@ export default function Positions() {
- Search Address + Search Address
diff --git a/src/components/common/PrimaryButton.tsx b/src/components/common/PrimaryButton.tsx index d798b50f..28892ad7 100644 --- a/src/components/common/PrimaryButton.tsx +++ b/src/components/common/PrimaryButton.tsx @@ -5,17 +5,24 @@ type PrimaryButtonProps = { children: React.ReactNode; className?: string; isSecondary?: boolean; -} +}; -export default function PrimaryButton({ href, children, className = '', isSecondary }: PrimaryButtonProps) { +export default function PrimaryButton({ + href, + children, + className = '', + isSecondary, +}: PrimaryButtonProps) { return ( ); -} \ No newline at end of file +} diff --git a/src/components/layout/header/Navbar.tsx b/src/components/layout/header/Navbar.tsx index e80c56e0..626e1127 100644 --- a/src/components/layout/header/Navbar.tsx +++ b/src/components/layout/header/Navbar.tsx @@ -9,6 +9,7 @@ import { FaRegMoon, FaSun } from 'react-icons/fa'; import { useAccount } from 'wagmi'; import logo from '../../imgs/logo.png'; import AccountConnect from './AccountConnect'; +import { usePathname } from 'next/navigation'; export function NavbarLink({ href, @@ -21,10 +22,17 @@ export function NavbarLink({ target?: string; ariaLabel?: string; }) { + const pathname = usePathname(); + const isActive = pathname === href; + return ( @@ -58,29 +66,21 @@ function Navbar() {