Skip to content

Commit 094eaff

Browse files
committed
refactor: Adjust z-index values for footer and sidebar components to improve layering
1 parent b4c7b90 commit 094eaff

File tree

3 files changed

+58
-55
lines changed

3 files changed

+58
-55
lines changed

web/src/App.tsx

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,7 @@ function AppContent() {
182182

183183
return (
184184
<div className='flex h-screen bg-gray-50 dark:bg-gray-900'>
185-
{/* Sidebar */}
186-
<Sidebar
187-
categories={categories}
188-
selectedCategory={selectedCategory}
189-
onCategorySelect={handleCategorySelect}
190-
showFavoritesOnly={showFavoritesOnly}
191-
onToggleFavorites={handleToggleFavorites}
192-
isOpen={sidebarOpen}
193-
onClose={() => setSidebarOpen(false)}
194-
/>
185+
195186

196187
{/* Main content */}
197188
<div className='flex flex-1 flex-col overflow-hidden'>
@@ -205,49 +196,61 @@ function AppContent() {
205196
sidebarOpen={sidebarOpen}
206197
onShowCookiePreferences={() => setShowCookiePreferences(true)}
207198
/>
208-
209-
{/* Main content area */}
210-
<main className='flex-1 overflow-y-auto'>
211-
<div className='mx-auto max-w-7xl px-4 py-6 pb-20 sm:px-6 lg:px-8'>
212-
{/* Hero section */}
213-
{!searchQuery && !selectedCategory && !showFavoritesOnly && (
214-
<div className='mb-8 text-center'>
215-
<h1 className='mb-4 text-4xl font-bold text-gray-900 dark:text-gray-100'>
216-
<span className='text-gradient'>Fluent Jot</span>
217-
</h1>
218-
<p className='mx-auto max-w-2xl text-lg text-gray-600 dark:text-gray-300'>
219-
Browse and download Microsoft's Fluent UI icons and emojis in beautiful hand-drawn
220-
Excalidraw format. Perfect for wireframes, mockups, and design sketches.
221-
</p>
222-
<div className='mt-6 flex flex-wrap justify-center gap-4 text-sm text-gray-500 dark:text-gray-400'>
223-
<span className='flex items-center'>
224-
<span className='mr-2 h-2 w-2 rounded-full bg-primary-500'></span>
225-
5,980+ Icons
226-
</span>
227-
<span className='flex items-center'>
228-
<span className='mr-2 h-2 w-2 rounded-full bg-accent-500'></span>
229-
1,595+ Emojis
230-
</span>
231-
<span className='flex items-center'>
232-
<span className='mr-2 h-2 w-2 rounded-full bg-green-500'></span>
233-
Free to Use
234-
</span>
199+
<div className='flex flex-1 overflow-scroll'>
200+
{/* Sidebar */}
201+
<Sidebar
202+
categories={categories}
203+
selectedCategory={selectedCategory}
204+
onCategorySelect={handleCategorySelect}
205+
showFavoritesOnly={showFavoritesOnly}
206+
onToggleFavorites={handleToggleFavorites}
207+
isOpen={sidebarOpen}
208+
onClose={() => setSidebarOpen(false)}
209+
/>
210+
{/* Main content area */}
211+
<main className='flex-1 overflow-y-auto'>
212+
<div className='mx-auto max-w-7xl px-4 py-6 pb-20 sm:px-6 lg:px-8'>
213+
{/* Hero section */}
214+
{!searchQuery && !selectedCategory && !showFavoritesOnly && (
215+
<div className='mb-8 text-center'>
216+
<h1 className='mb-4 text-4xl font-bold text-gray-900 dark:text-gray-100'>
217+
<span className='text-gradient'>Fluent Jot</span>
218+
</h1>
219+
<p className='mx-auto max-w-2xl text-lg text-gray-600 dark:text-gray-300'>
220+
Browse and download Microsoft's Fluent UI icons and emojis in beautiful hand-drawn
221+
Excalidraw format. Perfect for wireframes, mockups, and design sketches.
222+
</p>
223+
<div className='mt-6 flex flex-wrap justify-center gap-4 text-sm text-gray-500 dark:text-gray-400'>
224+
<span className='flex items-center'>
225+
<span className='mr-2 h-2 w-2 rounded-full bg-primary-500'></span>
226+
5,980+ Icons
227+
</span>
228+
<span className='flex items-center'>
229+
<span className='mr-2 h-2 w-2 rounded-full bg-accent-500'></span>
230+
1,595+ Emojis
231+
</span>
232+
<span className='flex items-center'>
233+
<span className='mr-2 h-2 w-2 rounded-full bg-green-500'></span>
234+
Free to Use
235+
</span>
236+
</div>
235237
</div>
236-
</div>
237-
)}
238-
239-
{/* Icon Browser */}
240-
<IconBrowser
241-
icons={icons}
242-
emojis={emojis}
243-
categories={categories}
244-
searchFilters={searchFilters}
245-
onStylesChange={handleStylesChange}
246-
isLoading={isLoading}
247-
error={error}
248-
/>
249-
</div>
250-
</main>
238+
)}
239+
240+
{/* Icon Browser */}
241+
<IconBrowser
242+
icons={icons}
243+
emojis={emojis}
244+
categories={categories}
245+
searchFilters={searchFilters}
246+
onStylesChange={handleStylesChange}
247+
isLoading={isLoading}
248+
error={error}
249+
/>
250+
</div>
251+
</main>
252+
</div>
253+
251254
</div>
252255

253256
{/* Fixed Footer */}

web/src/components/layout/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function Footer({ onShowCookiePreferences }: FooterProps) {
1212
analytics.trackExternalLink(url, linkText);
1313
};
1414
return (
15-
<footer className='fixed bottom-0 left-0 right-0 z-10 border-t border-gray-200 bg-white/80 backdrop-blur-sm dark:border-gray-700 dark:bg-gray-950/80'>
15+
<footer className='fixed bottom-0 left-0 right-0 z-40 border-t border-gray-200 bg-white/80 backdrop-blur-sm dark:border-gray-700 dark:bg-gray-950/80'>
1616
<div className='mx-auto max-w-7xl px-4 py-3 sm:px-6 lg:px-8'>
1717
<div className='flex flex-col items-center justify-between gap-2 text-xs text-gray-500 dark:text-gray-400 sm:flex-row sm:gap-0'>
1818
<div className='flex flex-col items-center gap-1 sm:flex-row sm:gap-4'>

web/src/components/layout/Sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ export default function Sidebar({
5050
<>
5151
{/* Mobile overlay */}
5252
{isOpen && (
53-
<div className='fixed inset-0 z-30 bg-black bg-opacity-25 md:hidden' onClick={onClose} />
53+
<div className='fixed inset-0 z-40 bg-black bg-opacity-25 md:hidden' onClick={onClose} />
5454
)}
5555

5656
{/* Sidebar */}
5757
<div
5858
className={clsx(
59-
'fixed inset-y-0 left-0 z-40 w-64 transform overflow-y-auto border-r border-gray-200 bg-white transition-transform duration-300 ease-in-out dark:border-gray-700 dark:bg-gray-900 md:relative md:translate-x-0',
59+
'fixed inset-y-0 left-0 z-10 mb-4 w-64 transform overflow-y-auto border-r border-gray-200 bg-white transition-transform duration-300 ease-in-out dark:border-gray-700 dark:bg-gray-900 md:relative md:translate-x-0',
6060
isOpen ? 'translate-x-0' : '-translate-x-full'
6161
)}
6262
>

0 commit comments

Comments
 (0)