redid styles of home page, and dashboard

app/globals.css

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 /* @import "tailwindcss";
 
 :root {
@@ -29,7 +27,6 @@ body {
 /* 1. Import BOTH fonts in one go */
 @import url('https://fonts.googleapis.com/css2?family=Concert+One&family=Pixelify+Sans:wght@400;700&display=swap');
 
->>>>>>> 44b5a4dc49ea757e9790ba8309edc6b37d764105
 @import "tailwindcss";
 
 :root {
@@ -43,18 +40,12 @@ body {
 
   /* 3. Assign fonts to Tailwind's theme */
 
-<<<<<<< HEAD
-  /* Tell Tailwind to use the variables already defined in app/layout.tsx */
-  --font-sans: var(--font-sans);
-  --font-header: var(--font-header);
-=======
   /* --font-sans is for regular text (Concert One) */
   --font-sans: var(--font-concert-one);
 
   /* We add a new font family for headers (Pixelify Sans) */
   /* This also creates a 'font-header' utility class */
   --font-header: var(--font-pixelify);
->>>>>>> 44b5a4dc49ea757e9790ba8309edc6b37d764105
 
   --font-mono: var(--font-geist-mono);
 }