diff --git a/app/globals.css b/app/globals.css index 40d4e5312..9dc7198f3 100644 --- a/app/globals.css +++ b/app/globals.css @@ -17,18 +17,12 @@ } } -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); -} - @layer utilities { .text-balance { text-wrap: balance; } } + +body { + @apply text-textPrimary; +} diff --git a/app/layout.tsx b/app/layout.tsx index 5541c1a26..489fb6fa2 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,15 +1,20 @@ -import type { Metadata } from 'next' +import type { Metadata, Viewport } from 'next' import './globals.css' +import Navbar from '@/components/Navbar' export const metadata: Metadata = { title: 'CompSoc', description: "CompSoc is Edinburgh University's technology society! We're Scotland's best and largest of its kind, and form one of the largest societies within the university.", icons: { - icon: '/compsoc-icon.png', + icon: '/compsoc-mini.png', }, } +export const viewport: Viewport = { + themeColor: '#222222', // TODO: Should be fed from tailwind.config.ts +} + export default function RootLayout({ children, }: Readonly<{ @@ -17,7 +22,10 @@ export default function RootLayout({ }>) { return ( - {children} + + +
{children}
+ ) } diff --git a/app/page.tsx b/app/page.tsx index e929dcb41..425192eee 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,14 +1,19 @@ +import { prefix } from '@/utils/prefix' import Image from 'next/image' -import { prefix } from './utils/prefix' export default function Home() { return ( -
+
CompSoc logo
) diff --git a/components/Navbar.tsx b/components/Navbar.tsx new file mode 100644 index 000000000..cc62e6248 --- /dev/null +++ b/components/Navbar.tsx @@ -0,0 +1,30 @@ +import { prefix } from '@/utils/prefix' +import Link from 'next/link' +import Image from 'next/image' + +const NavBar = () => { + return ( + + ) +} + +export default NavBar diff --git a/public/logo.png b/public/compsoc-long.png similarity index 100% rename from public/logo.png rename to public/compsoc-long.png diff --git a/public/compsoc-icon.png b/public/compsoc-mini.png similarity index 100% rename from public/compsoc-icon.png rename to public/compsoc-mini.png diff --git a/public/compsoc-short.png b/public/compsoc-short.png new file mode 100644 index 000000000..5e9bf5989 Binary files /dev/null and b/public/compsoc-short.png differ diff --git a/tailwind.config.ts b/tailwind.config.ts index 2938e2af2..c95db73cb 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,21 +1,26 @@ -import type { Config } from "tailwindcss"; +import type { Config } from 'tailwindcss' const config: Config = { content: [ - "./pages/**/*.{js,ts,jsx,tsx,mdx}", - "./components/**/*.{js,ts,jsx,tsx,mdx}", - "./app/**/*.{js,ts,jsx,tsx,mdx}", + './pages/**/*.{js,ts,jsx,tsx,mdx}', + './components/**/*.{js,ts,jsx,tsx,mdx}', + './app/**/*.{js,ts,jsx,tsx,mdx}', ], theme: { extend: { backgroundImage: { - "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", - "gradient-conic": - "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", + 'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))', + 'gradient-conic': + 'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))', }, colors: { csred: '#CE3234', csgrey: '#222222', + background: '#222222', + foreground: '#353535', + border: '#484848', + textPrimary: '#FFFFFF', + textSecondary: '#A0A0A0', }, fontFamily: { 'space-mono': ['"Space Mono"', 'monospace'], @@ -28,5 +33,6 @@ const config: Config = { }, }, plugins: [], -}; -export default config; +} + +export default config diff --git a/tsconfig.json b/tsconfig.json index e7ff90fd2..1ee948c47 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,8 +17,11 @@ "name": "next" } ], + "baseUrl": ".", "paths": { - "@/*": ["./*"] + "@/*": ["./*"], + "@components/*": ["components/*"], + "@utils/*": ["utils/*"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], diff --git a/app/utils/prefix.ts b/utils/prefix.ts similarity index 100% rename from app/utils/prefix.ts rename to utils/prefix.ts