Merge pull request #53 from patelvivekdev/development

Fix dark mode flick
patelvivekdev · May 5, 2024 · f3d276a · f3d276a · vercel · May 5, 2024
2 parents 7128fc7 + 584558e
commit f3d276a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -10,6 +10,7 @@ import { SpeedInsights } from '@vercel/speed-insights/next';
 import { Toaster } from 'react-hot-toast';
 import Script from 'next/script';
 import ScrollToTopButton from '@/components/ScrollToTopButton';
+import { ThemeToggle } from '@/components/ThemeToggle';
 
 const fontSans = FontSans({
   subsets: ['latin'],
@@ -62,19 +63,20 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang='en' className='dark'>
+    <html lang='en'>
       <head>
         <Script defer src='https://us.umami.is/script.js' data-website-id='aa7603cb-3e5d-474c-b1a5-f92e18751e5c' />
       </head>
       <body className={cn('mx-auto font-sans antialiased bg-neutral-100 dark:bg-neutral-900 ', fontSans.variable)}>
         <ThemeProvider attribute='class' defaultTheme='system' enableSystem={true}>
           <Navbar />
           <main>{children}</main>
-          <Analytics />
           <SpeedInsights />
-          <Footer />
           <ScrollToTopButton />
+          <ThemeToggle />
           <Toaster position='top-right' />
+          <Footer />
+          <Analytics />
         </ThemeProvider>
       </body>
     </html>

diff --git a/components/Footer.jsx b/components/Footer.jsx
@@ -1,5 +1,4 @@
 import Link from 'next/link';
-import { ThemeToggle } from './ThemeToggle';
 
 const Footer = () => {
   // find the current year
@@ -12,7 +11,6 @@ const Footer = () => {
           <p className='text-base font-semibold'>© {year} Vivek Patel | Made with ❤️ Next js</p>
         </div>
       </div>
-      <ThemeToggle />
     </footer>
   );
 };

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -7,8 +7,7 @@ const config: Config = {
     './pages/**/*.{js,ts,jsx,tsx,mdx}',
     './components/**/*.{js,ts,jsx,tsx,mdx}',
     './app/**/*.{js,ts,jsx,tsx,mdx}',
-    './blogs/**/*.mdx',
-    './projects/**/*.mdx',
+    '.content/**/*.mdx',
   ],
   theme: {
     extend: {