Skip to content

Commit

Permalink
Merge branch 'main' into sarahsimionescu/tech-24-sponsors
Browse files Browse the repository at this point in the history
  • Loading branch information
err53 authored Sep 27, 2023
2 parents 1b4bf8a + e150e60 commit 8fc71c1
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 33 deletions.
4 changes: 4 additions & 0 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import("prettier").Config} */
export default {
plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
};
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode",
"prettier.documentSelectors": [
"**/*.astro"
],
"prettier.requireConfig": true
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"dependencies": {
"@astrojs/tailwind": "^5.0.0",
"@fontsource-variable/inter": "^5.0.8",
"@types/canvas-confetti": "^1.6.0",
"astro": "^3.0.7",
"astro-critters": "^2.0.11",
Expand Down
7 changes: 7 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/Hero.astro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="mx-auto max-w-lg">
<div class="mx-auto max-w-lg pt-10">
<h1 class="text-6xl">DeltaHacks 10</h1>
<p>Back and better than ever!</p>
</div>
11 changes: 8 additions & 3 deletions src/layouts/main.astro
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
---
const { content } = Astro.props;
import "@fontsource-variable/inter";
---

<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<title>{content.title}</title>
<meta name="generator" content={Astro.generator} />
<title>DeltaHacks 10</title>
<meta
name="description"
content="A landing page for McMaster's annual hackathon for change"
/>
</head>
<body>
<body class="bg-[#19333A] text-white">
<slot />
</body>
</html>
38 changes: 11 additions & 27 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
import Layout from "../layouts/main.astro";
// Component Imports
// import Button from '../components/Button.astro';
import Hero from "../components/Hero.astro";
Expand All @@ -8,30 +9,13 @@ import Sponsors from "../components/Sponsors.astro";
// https://docs.astro.build/core-concepts/astro-components/
---

<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<title>DeltaHacks 10</title>
<meta
name="description"
content="A landing page for McMaster's annual hackathon for change"
/>
</head>

<body>
<div class="pt-10">
<Hero />
<p class="pt-10 px-10">
This site is still under construction! If you stumble across this,
please check back later! orz
</p>
<div></div>
<div class="w-full flex flex-col items-center bg-[#19333A]">
<Sponsors />
</div>
</div>
</body>
</html>
<Layout>
<Hero />
<p class="px-10 pt-10">
This site is still under construction! If you stumble across this, please
check back later! orz
</p>
<div class="w-full flex flex-col items-center bg-[#19333A]">
<Sponsors />
</div>
</Layout>
13 changes: 12 additions & 1 deletion tailwind.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
const defaultTheme = require("tailwindcss/defaultTheme");

module.exports = {
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
theme: {
extend: {},
extend: {
fontFamily: {
sans: ["InterVariable", "Inter", ...defaultTheme.fontFamily.sans],
},
colors: {
"dh-red": "#E72250",
"dh-yellow": "#F8D13D",
"dh-blue": "#2D9AEA",
},
},
},
plugins: [],
};

0 comments on commit 8fc71c1

Please sign in to comment.