Merge pull request #15 from UR-dandyhacks/dev

SPICE UP the website with Emily's cute graphics

README.md

@@ -1,2 +1,47 @@
-# DandyHacks23
-Website for DandyHacks '23
+# 💖 The DandyHacks 2023 website
+
+This is the website for DandyHacks 2023, the 11th run of the University of
+Rochester's premier hackathon. Go Yellowjackets! 🐝
+
+## 🍽️ Tech stack
+
+Our tech stack is optimized for the best speed:
+
+- HTML
+- CSS
+- [Vanilla JS](http://vanilla-js.com/)
+
+We are considering TailwindCSS.
+
+## 🚀 Deploy
+
+Just start a local server! e.g.
+
+```shell
+python3 -m http.server
+```
+
+## 🌳 Branches
+
+- `dev`: the main development branch; all code gets branched from and merged
+  into this branch;
+- `pre-launch`: the pre-launch upstream; once certain developments are done in
+  `dev`, changes get merged into this branch. **Now defunct**;
+- `final-website`: the final website upstream. Features developed in `dev` get
+  merged into here.
+
+## 🚦 Status
+
+We have finished the pre-launch website and are now working on the final
+website. Please see [the final website project][project] for task tracking.
+
+[project]: https://github.com/orgs/UR-dandyhacks/projects/3
+
+## 💪 The awesome team
+
+🧙‍♂️ Duong "Zach" Nguyen (lead, @cszach)  
+👩‍💻 Maisha  
+👨‍💻 Ahmed  
+👨‍💻 Alvin  
+👨‍💻 Tom  
+👨‍💻 Anthony

index.html

@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <title>DandyHacks 2023</title>
-  <link rel="stylesheet" href="style.css" />
+  <link rel="stylesheet" href="main.css" />
   <link rel="icon" type="image/x-icon" href="favicon.png">
 </head>
 
@@ -51,6 +51,7 @@ <h2>November 3-5</h2>
   </section>
   <section class="about" id="about">
     <div class="container">
+      <img src="img/sticker2.png" />
       <div>
         <h2>What is DandyHacks?</h2>
         <p>
@@ -68,7 +69,7 @@ <h2>What is DandyHacks?</h2>
           on Nov 3-5 in the Feldman Ballroom. We hope to see you there!
         </p>
       </div>
-      <div></div>
+      <img src="img/sticker1.png" />
     </div>
   </section>
   <section class="faq" id="faq">

style.css → main.css

@@ -1,3 +1,7 @@
+/* @tailwind base; */
+/* @tailwind components; */
+/* @tailwind utilities; */
+
 @font-face {
   font-family: "Katahdin Round";
   src: url(fonts/katahdin-round/KatahdinRound.otf) format("opentype");
@@ -208,25 +212,16 @@ section .container {
   gap: 77px;
 }
 
-.about .container >div:first-child {
+.about .container >div {
   display: flex;
+  flex: 0 0 454px;
   flex-direction: column;
   justify-content: center;
   align-items: flex-start;
   padding: 0px;
   gap: 53px;
 }
 
-.about .container >div:nth-child(2) {
-  width: 407px;
-  height: 441px;
-
-  background: var(--indigo);
-  border-radius: 30px;
-
-  flex: none;
-}
-
 .tracks>div,
 .side-challenges>div {
   display: flex;
@@ -377,6 +372,11 @@ footer {
 
   box-sizing: border-box;
   width: 100%;
+
+  background-image: url("img/sticker2-no_border.png");
+  background-repeat: no-repeat;
+  background-position: center top;
+  background-size: 344px auto;
 }
 
 footer .contact {
@@ -461,4 +461,4 @@ footer .coc {
 /* Extra large devices (large laptops and desktops, 1200px and up) */
 @media only screen and (min-width: 1200px) {
 
-}
+}