Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohd. Ashhar Khan authored and Mohd. Ashhar Khan committed Oct 28, 2024
2 parents 2a2fd60 + 7eeb8b0 commit d1f4e65
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import TestimonialDetails from './components/TestimonialDetails';
import Footer from './components/Footer';
import ProductCardDetailsPage from './components/ProductCardDetailsPage';
import CalendarDetails from './components/CalendarDetails';
import Checkbox from './components/Checkbox';
import Statistic from './components/StatisticDetails';
import GalleryDetailsPage from './components/GalleryDetailsPage';
import Checkbox from './components/Checkbox';
import SpinnerDetailsPage from './components/SpinnerDetailsPage';

const App: React.FC = () => {
Expand Down Expand Up @@ -68,7 +68,6 @@ const App: React.FC = () => {
localStorage.setItem('theme', 'light');
}
};

return (
<Router>
<Header darkMode={darkMode} toggleDarkMode={toggleDarkMode} />
Expand Down
2 changes: 0 additions & 2 deletions src/components/GlassyUIComponentsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
Wrench,
Calendar,
} from 'lucide-react';

import Accordion from './Accordion';
import { date } from 'zod';

Expand Down Expand Up @@ -355,7 +354,6 @@ const GlassyUIComponentsPage: React.FC<{ darkMode: boolean }> = ({
>
GlassyUI
</div>

<div
className={`flex items-center bg-gradient-to-r ${darkMode ? 'from-slate-800 via-slate-700 to-slate-900 text-white' : 'from-white/80 via-black/10 to-white/90 text-black'} w-2/5 rounded-lg shadow-lg overflow-hidden`}
>
Expand Down
1 change: 0 additions & 1 deletion src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ const Header: React.FC<{ darkMode: boolean; toggleDarkMode: () => void }> = ({
>
Signup
</li>

{/* Dark Mode Toggle Button */}
<button
onClick={toggleDarkMode}
Expand Down

0 comments on commit d1f4e65

Please sign in to comment.