From da785dfbf1b72b87f0a62a75352fe6affa7e5a82 Mon Sep 17 00:00:00 2001 From: Noam Kassoff Date: Sat, 16 Nov 2024 22:59:41 -0800 Subject: [PATCH 1/3] Added placeholder blurb and prospectus image --- src/App.tsx | 3 +++ src/images/prospectus.png | Bin 0 -> 10583 bytes src/index.css | 16 ++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 src/images/prospectus.png diff --git a/src/App.tsx b/src/App.tsx index 6c78ac5..b79fd6e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,6 +2,7 @@ import "./App.css"; import Button from "@mui/joy/Button"; import arrow from "./images/arrow.png"; import Footer from "./components/Footer"; +import Prospectus from "./images/prospectus.png" function App() { return ( @@ -11,6 +12,8 @@ function App() { url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap');
+

Sponsor MVHacks 7.0!

MVHacks is now in its 8th year of inspiring high school students throughout the country to get together and build great projects. As a prestigious, in-person hackathon, our past events have consistently attracted over 200 unique and diverse attendees. With your support, we aim to engage over 250+ students for MVHacks.

To discover more about sponsorship opportunities, please download our Sponsorship Prospectus below and reach out to us at hello@mvhacks.io.

Join us, and let's make MVHacks 8.0 an unforgettable experience. We eagerly await the participation of your company!

Download the Sponsorship Prospectus
+ -
-
-
- - - ); + return (
+ +
+ + +
+
+
+
+
); } - -export default App; +export default App; \ No newline at end of file diff --git a/src/components/Prospectus.tsx b/src/components/Prospectus.tsx new file mode 100644 index 0000000..e0b174b --- /dev/null +++ b/src/components/Prospectus.tsx @@ -0,0 +1,17 @@ +import prospectusImage from "../images/prospectus.png"; +export default function Prospectus() { + return (
+
+

Sponsor MVHacks 8.0!

+

MVHacks is now in its 8th year of inspiring high school students throughout the country to get together and build great projects. As a prestigious, in-person hackathon, our past events have consistently attracted over 200 unique and diverse attendees. With your support, we aim to engage over 250+ students for MVHacks.

+

To discover more about sponsorship opportunities, please download our Sponsorship Prospectus below and reach out to us at  + hello@mvhacks.io.

+

Join us, and let's make MVHacks 8.0 an unforgettable experience. We eagerly await the participation of your company!

+ Download the Sponsorship Prospectus +
+ +
) +} \ No newline at end of file diff --git a/src/index.css b/src/index.css index a5fef10..52bf9d2 100644 --- a/src/index.css +++ b/src/index.css @@ -1,54 +1,63 @@ body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - background-color: black; -} - + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-color: black; +} + code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; } + #footer { - text-align: center; + text-align: center; } + #alert { - height: 39px; - background-color: #81807F; - font-size: 14.9; - font-family: "Montserrat", sans-serif; - padding-left: 30px; + height: 39px; + background-color: #81807F; + font-size: 14.9; + font-family: "Montserrat", sans-serif; + padding-left: 30px; } #devpost { - width: 250px; - background-color: blueviolet; + width: 250px; + background-color: blueviolet; } + #contactUs { - width: 250px; - background-color: blueviolet; + width: 250px; + background-color: blueviolet; } + #arrow { - margin-right: -10px; - margin-left: 27px; + margin-right: -10px; + margin-left: 27px; } + #blurbSponsors { - color: white; - padding-left: 40px; - padding-right: 40px; - padding-bottom: 25px; + color: white; + padding-left: 40px; + padding-right: 40px; + padding-bottom: 25px; } + #email { - color: rgb(147, 147, 230) + color: rgb(147, 147, 230) } + #downloadProspectus { - color: rgb(147, 147, 230) + color: rgb(147, 147, 230) } -#prospectus { - padding-left: 40px; - padding-right: 40px; + +#prospectusImage { + padding-left: 40px; + padding-right: 40px; + padding-bottom: 20px; } \ No newline at end of file From 0070afeb17ec3ac9831407e20452e2b5d4af108c Mon Sep 17 00:00:00 2001 From: emilym Date: Thu, 21 Nov 2024 13:23:12 -0800 Subject: [PATCH 3/3] finish merge --- src/App.css | 4 ++-- src/App.tsx | 6 +++--- src/components/Prospectus.tsx | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/App.css b/src/App.css index dc7352d..afc91c2 100644 --- a/src/App.css +++ b/src/App.css @@ -58,8 +58,8 @@ h2 { } .sponsor { - height: 600px; - background-color:cadetblue + /* height: 600px; + background-color:cadetblue */ } .faqs { diff --git a/src/App.tsx b/src/App.tsx index 9938da4..e81fd49 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -55,12 +55,12 @@ function App() {
-
- -
+
+ +

TEAM

diff --git a/src/components/Prospectus.tsx b/src/components/Prospectus.tsx index e0b174b..62f653d 100644 --- a/src/components/Prospectus.tsx +++ b/src/components/Prospectus.tsx @@ -10,6 +10,7 @@ export default function Prospectus() { Download the Sponsorship Prospectus prospectus