clean up layout

ethanniser · Oct 18, 2024 · 6b1c6af · 6b1c6af
1 parent 24be6e0
commit 6b1c6af
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 55 deletions.
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -3,7 +3,7 @@
 @tailwind utilities;
 
 body {
-  font-family: sans-serif;
+  font-family: Arial, sans-serif;
 }
 
 @layer utilities {

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,9 +1,8 @@
 import type { Metadata } from "next";
 import localFont from "next/font/local";
 import "./globals.css";
-import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { Menu, Search } from "lucide-react";
+import { Search } from "lucide-react";
 import { categories } from "./data";
 import Link from "next/link";
 
@@ -37,19 +36,18 @@ export default function RootLayout({
         className={`${helvetica.variable} ${helveticaRoman.variable} ${futura.variable} flex min-h-full flex-col antialiased`}
       >
         <div className="flex flex-grow flex-col">
-          <header className="flex items-center justify-between border-b-2 border-yellow-300 p-4 font-futura">
+          <header className="font-futura flex items-center justify-between border-b-2 border-yellow-300 p-4">
             <div className="flex items-center space-x-4">
-              <Button variant="ghost" size="icon">
-                <Menu className="h-6 w-6" />
-                <span className="sr-only">Toggle menu</span>
-              </Button>
               <Link href="/" className="text-4xl font-bold text-green-800">
                 NextMaster
               </Link>
             </div>
             <div className="flex items-center space-x-4">
               <div className="relative">
-                <Input placeholder="Search" className="w-[300px]" />
+                <Input
+                  placeholder="Search"
+                  className="w-[450px] font-sans font-medium"
+                />
                 <Search className="absolute right-2 top-2.5 h-4 w-4 text-muted-foreground" />
               </div>
               <Link
@@ -88,62 +86,30 @@ export default function RootLayout({
           </div>
         </div>
         <footer className="flex h-6 items-center justify-between border-t border-gray-400 px-4 font-helvetica text-[11px]">
-          <div>
-            <Link
-              href="/about"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
-              Home
-            </Link>
+          <div className="space-x-1">
+            <span className="hover:bg-yellow-100 hover:underline">Home</span>
             <span>|</span>
-            <Link
-              href="/contact"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
+            <span className="hover:bg-yellow-100 hover:underline">
               Location
-            </Link>
+            </span>
             <span>|</span>
-            <Link
-              href="/terms"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
-              Returns
-            </Link>
+            <span className="hover:bg-yellow-100 hover:underline">Returns</span>
             <span>|</span>
-            <Link
-              href="/privacy"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
-              Careers
-            </Link>
+            <span className="hover:bg-yellow-100 hover:underline">Careers</span>
             <span>|</span>
-            <Link
-              href="/privacy"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
+            <span className="hover:bg-yellow-100 hover:underline">
               Mobile App
-            </Link>
+            </span>
             <span>|</span>
-            <Link
-              href="/privacy"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
+            <span className="hover:bg-yellow-100 hover:underline">
               Solidworks Add-In
-            </Link>
+            </span>
             <span>|</span>
-            <Link
-              href="/privacy"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
-              Help
-            </Link>
+            <span className="hover:bg-yellow-100 hover:underline">Help</span>
             <span>|</span>
-            <Link
-              href="/privacy"
-              className="p-1 hover:bg-yellow-200 hover:underline"
-            >
+            <span className="hover:bg-yellow-100 hover:underline">
               Settings
-            </Link>
+            </span>
           </div>
           <div>
             By using this website, you agree to our Terms and Conditions and

diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
@@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          "flex h-9 w-full border border-black bg-transparent px-3 py-1 text-sm outline-none",
+          "flex h-9 w-full border border-gray-500 bg-transparent px-3 py-1 text-sm outline-none",
           className,
         )}
         ref={ref}