Skip to content

Commit 758fde9

Browse files
authored
Merge pull request #187 from AbhijitPrajapati12/fix/navbar
navbar repetition fix
2 parents 460b757 + b9b7e85 commit 758fde9

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

apps/web/src/app/(main)/(landing)/layout.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import Navbar from '@/components/landing-sections/navbar'
21
import React from 'react'
32

43
const Layout = ({ children }: { children: React.ReactNode }) => {
54
return (
65
<section>
7-
<Navbar />
86
{children}
97
</section>
108
)

apps/web/src/components/landing-sections/navbar.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const Navbar = () => {
4646
return (
4747
<motion.nav
4848
initial={{ opacity: 0 }}
49-
animate={showNavbar ? { opacity: 1 } : { opacity: 0, display: 'none' }}
49+
animate={showNavbar ? { opacity: 1 } : { opacity: 0, display: "none" }}
5050
transition={{ duration: 0.3 }}
5151
className={cn(
5252
" z-40 flex items-center justify-between px-4 py-3 bg-neutral-900/5 backdrop-blur-xl border-white/10",
@@ -57,7 +57,7 @@ const Navbar = () => {
5757
>
5858
<div className="flex items-center gap-3">
5959
<button
60-
className="md:hidden text-white"
60+
className="min-[1115px]:hidden text-white"
6161
onClick={() => setIsOpen(!isOpen)}
6262
aria-label="Toggle navigation menu"
6363
aria-expanded={isOpen}
@@ -76,7 +76,7 @@ const Navbar = () => {
7676
<span>Opensox AI</span>
7777
</div>
7878
</div>
79-
<div className="hidden md:flex items-center gap-5 tracking-tight text-lg font-light text-text-tertiary">
79+
<div className="hidden min-[1115px]:flex items-center gap-5 max-[1270px]:gap-4 max-[1173px]:gap-3 tracking-tight text-lg max-[1270px]:text-base max-[1173px]:text-sm font-light max-[1173px]:font-normal text-[#d1d1d1]">
8080
{links.map((link, index) => {
8181
const isActive = pathname === link.href;
8282
return (
@@ -98,7 +98,7 @@ const Navbar = () => {
9898
href="https://github.com/apsinghdev/opensox"
9999
target="_blank"
100100
rel="noopener noreferrer"
101-
className="hidden lg:flex items-center gap-2 px-4 py-2.5 bg-[#0d1117] hover:bg-[#161b22] transition-colors rounded-lg border border-[#30363d] text-white"
101+
className="hidden min-[1115px]:flex items-center gap-2 px-4 py-2.5 bg-github-bg hover:bg-github-hover transition-colors rounded-lg border border-github-border text-white"
102102
>
103103
<Github className="w-5 h-5" />
104104
<span className="text-sm font-medium">Contribute</span>
@@ -115,7 +115,7 @@ const Navbar = () => {
115115
initial={{ opacity: 0, y: -10 }}
116116
animate={{ opacity: 1, y: 0 }}
117117
transition={{ duration: 0.25 }}
118-
className="absolute top-full mt-2 left-0 w-full bg-neutral-900/90 backdrop-blur-xl border border-white/10 md:hidden flex flex-col items-center py-5 space-y-4 z-50 rounded-3xl"
118+
className="absolute top-full mt-2 left-0 w-full bg-neutral-900/90 backdrop-blur-xl border border-white/10 min-[1115px]:hidden flex flex-col items-center py-5 space-y-4 z-50 rounded-3xl"
119119
>
120120
{links.map((link, index) => (
121121
<Link
@@ -132,7 +132,7 @@ const Navbar = () => {
132132
target="_blank"
133133
rel="noopener noreferrer"
134134
onClick={() => setIsOpen(false)}
135-
className="flex items-center gap-2 px-4 py-2 bg-[#0d1117] hover:bg-[#161b22] rounded-lg border border-[#30363d] text-white transition-colors"
135+
className="flex items-center gap-2 px-4 py-2 bg-github-bg hover:bg-github-hover rounded-lg border border-github-border text-white transition-colors"
136136
>
137137
<Github className="w-5 h-5" />
138138
<span className="text-sm font-medium">Contribute</span>

apps/web/tailwind.config.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ const config: Config = {
7272
warning: colors.status.warning,
7373
info: colors.status.info,
7474

75+
// External brand colors
76+
github: {
77+
bg: colors.external.github.bg,
78+
hover: colors.external.github.hover,
79+
border: colors.external.github.border,
80+
},
81+
7582
// Legacy ox-* colors (for gradual migration) - will be deprecated
7683
"ox-purple": colors.brand.purple.DEFAULT,
7784
"ox-purple-2": colors.brand.purple.dark,

0 commit comments

Comments
 (0)