Skip to content

Commit 25edd31

Browse files
michaelmcneesclaude
andcommitted
merge: resolve conflicts with main (cel.go, Nav.astro)
- Keep artifacts CEL variable addition - Keep responsive nav gap fix (gap-4 lg:gap-8) with updated comment from main Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2 parents fe4c688 + 21cdd42 commit 25edd31

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

site/src/components/Nav.astro

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ const prefix = isHome ? '' : '/';
77
const isDocs = Astro.url.pathname === '/docs' || Astro.url.pathname.startsWith('/docs/');
88
---
99
<nav aria-label="Main navigation" class="fixed top-0 left-0 right-0 z-50 border-b border-outline-variant bg-surface/80 backdrop-blur-md">
10-
<div class={`nav-inner mx-auto px-6 flex items-center justify-between h-16 ${isHome ? 'max-w-[1200px]' : 'max-w-[1280px]'}`}>
11-
<!-- Logo -->
10+
<div class={`nav-inner mx-auto px-6 flex items-center justify-center lg:justify-between h-16 ${isHome ? 'max-w-[1200px]' : 'max-w-[1280px]'}`}>
11+
<!-- Logo — centered on mobile, left-aligned on desktop -->
1212
<a href="/" class="font-mono text-lg font-bold text-on-surface tracking-tight">
1313
mantle<span class="text-primary">_</span>
1414
</a>
1515

16-
<!-- Center links (hidden on mobile) -->
16+
<!-- Center links (hidden on mobile) — acts as middle section on desktop -->
1717
<div class="hidden md:flex items-center gap-4 lg:gap-8">
1818
<a href={`${prefix}#how-it-works`} class="text-sm text-on-surface-variant hover:text-on-surface transition-colors">How It Works</a>
1919
<a href={`${prefix}#connectors`} class="text-sm text-on-surface-variant hover:text-on-surface transition-colors">Connectors</a>
@@ -23,7 +23,7 @@ const isDocs = Astro.url.pathname === '/docs' || Astro.url.pathname.startsWith('
2323

2424
<!-- Right side -->
2525
<div class="flex items-center gap-4">
26-
<a href="https://github.com/dvflw/mantle" target="_blank" rel="noopener" class="text-on-surface-variant hover:text-on-surface transition-colors" aria-label="GitHub">
26+
<a href="https://github.com/dvflw/mantle" target="_blank" rel="noopener" class="hidden lg:block text-on-surface-variant hover:text-on-surface transition-colors" aria-label="GitHub">
2727
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24"><path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57A12.02 12.02 0 0024 12c0-6.63-5.37-12-12-12z"/></svg>
2828
</a>
2929
<a href={`${prefix}#get-started`} class="hidden md:inline-flex px-3 py-1.5 lg:px-4 lg:py-2 bg-primary text-on-primary text-sm font-medium hover:bg-primary-dim transition-colors">
@@ -41,12 +41,6 @@ const isDocs = Astro.url.pathname === '/docs' || Astro.url.pathname.startsWith('
4141
<svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M2.25 12l8.954-8.955a1.126 1.126 0 011.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"/></svg>
4242
<span>Home</span>
4343
</a>
44-
{isDocs && (
45-
<button id="bottom-nav-docs-btn" class="bottom-nav-item flex flex-col items-center gap-0.5 px-3 py-1 text-[11px] text-on-surface-variant hover:text-on-surface transition-colors" aria-label="Documentation menu">
46-
<svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"/></svg>
47-
<span>Menu</span>
48-
</button>
49-
)}
5044
<a href="/docs/getting-started" class:list={["bottom-nav-item flex flex-col items-center gap-0.5 px-3 py-1 text-[11px] transition-colors", isDocs ? "text-primary" : "text-on-surface-variant hover:text-on-surface"]}>
5145
<svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25"/></svg>
5246
<span>Docs</span>
@@ -55,6 +49,12 @@ const isDocs = Astro.url.pathname === '/docs' || Astro.url.pathname.startsWith('
5549
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24"><path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57A12.02 12.02 0 0024 12c0-6.63-5.37-12-12-12z"/></svg>
5650
<span>GitHub</span>
5751
</a>
52+
{isDocs && (
53+
<button id="bottom-nav-docs-btn" class="bottom-nav-item flex flex-col items-center gap-0.5 px-3 py-1 text-[11px] text-on-surface-variant hover:text-on-surface transition-colors" aria-label="Documentation menu">
54+
<svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"/></svg>
55+
<span>Menu</span>
56+
</button>
57+
)}
5858
</div>
5959
</nav>
6060

0 commit comments

Comments
 (0)