From b344dc95596a0201478c686b028777ee2f961808 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Oct 2023 20:17:33 -0400 Subject: [PATCH 1/4] Add track icons --- img/tracks/emerging-tech.svg | 47 ++++++++++++++ img/tracks/entertainment.svg | 107 ++++++++++++++++++++++++++++++++ img/tracks/productivity.svg | 115 +++++++++++++++++++++++++++++++++++ 3 files changed, 269 insertions(+) create mode 100644 img/tracks/emerging-tech.svg create mode 100644 img/tracks/entertainment.svg create mode 100644 img/tracks/productivity.svg diff --git a/img/tracks/emerging-tech.svg b/img/tracks/emerging-tech.svg new file mode 100644 index 0000000..b45351f --- /dev/null +++ b/img/tracks/emerging-tech.svg @@ -0,0 +1,47 @@ + + + + + + + + + diff --git a/img/tracks/entertainment.svg b/img/tracks/entertainment.svg new file mode 100644 index 0000000..52bcca0 --- /dev/null +++ b/img/tracks/entertainment.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/tracks/productivity.svg b/img/tracks/productivity.svg new file mode 100644 index 0000000..ab70bd7 --- /dev/null +++ b/img/tracks/productivity.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + From 944dc91ae193e552ef570f25b19440b2d729f846 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Oct 2023 20:17:53 -0400 Subject: [PATCH 2/4] Add the tracks section --- index.html | 37 +++++++++++++++++++++++++++++++ styles.css | 54 ++++++++++++++++++++++++++++++++++++++++++---- tailwind.config.js | 1 - 3 files changed, 87 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 5ab8d41..49c0537 100644 --- a/index.html +++ b/index.html @@ -82,6 +82,43 @@

What is DandyHacks?

+
+
+

Tracks

+

+ Choose one track to submit your project into. Each track will have + three top winners, and each project may only win in one track. Each + track will have different prizes, so pick and choose your track + depending on which prize you want to win! +

+
+
+ A window with a video player +

Entertainment

+

+ What innovative platforms can be created for content creation and + distribution? +

+
+
+ A to-do lists with 2 items, both of which are checked +

Productivity

+

+ What innovative tools or applications can help streamline workflow + and task management? +

+
+
+ A gear with a light bulb inside the hole +

Emerging Tech

+

+ What applications can emerging technologies, such as AI or VR, + have in various industries? +

+
+
+
+

FAQS

diff --git a/styles.css b/styles.css index 1dabf5a..88dd333 100644 --- a/styles.css +++ b/styles.css @@ -707,6 +707,16 @@ h1, h2, h3, h4, h5, h6 { margin: 0.25rem; } +.mx-auto { + margin-left: auto; + margin-right: auto; +} + +.my-9 { + margin-top: 2.25rem; + margin-bottom: 2.25rem; +} + .mb-16 { margin-bottom: 4rem; } @@ -715,6 +725,10 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: 6rem; } +.mb-4 { + margin-bottom: 1rem; +} + .mb-5 { margin-bottom: 1.25rem; } @@ -826,6 +840,10 @@ h1, h2, h3, h4, h5, h6 { height: 2rem; } +.h-\[448px\] { + height: 448px; +} + .h-full { height: 100%; } @@ -834,6 +852,10 @@ h1, h2, h3, h4, h5, h6 { height: 100vh; } +.w-40 { + width: 10rem; +} + .w-72 { width: 18rem; } @@ -842,6 +864,10 @@ h1, h2, h3, h4, h5, h6 { width: 2rem; } +.w-\[298px\] { + width: 298px; +} + .w-\[434px\] { width: 434px; } @@ -874,6 +900,10 @@ h1, h2, h3, h4, h5, h6 { flex-grow: 1; } +.grow-0 { + flex-grow: 0; +} + .table-auto { table-layout: auto; } @@ -1389,6 +1419,10 @@ h1, h2, h3, h4, h5, h6 { justify-items: stretch; } +.gap-11 { + gap: 2.75rem; +} + .gap-12 { gap: 3rem; } @@ -2033,6 +2067,10 @@ h1, h2, h3, h4, h5, h6 { padding: 3rem; } +.p-6 { + padding: 1.5rem; +} + .px-10 { padding-left: 2.5rem; padding-right: 2.5rem; @@ -2076,10 +2114,6 @@ h1, h2, h3, h4, h5, h6 { padding-bottom: 1.75rem; } -.pb-16 { - padding-bottom: 4rem; -} - .text-left { text-align: left; } @@ -2919,6 +2953,10 @@ canvas { display: flex; } + .lg\:w-\[999px\] { + width: 999px; + } + .lg\:flex-\[0_0_454px\] { flex: 0 0 454px; } @@ -2939,6 +2977,14 @@ canvas { gap: 5rem; } + .lg\:gap-11 { + gap: 2.75rem; + } + + .lg\:self-auto { + align-self: auto; + } + .lg\:self-start { align-self: flex-start; } diff --git a/tailwind.config.js b/tailwind.config.js index bce0b1e..03ce118 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -8,7 +8,6 @@ module.exports = { 'body': ['"Fivo Sans"', 'sans-serif'] }, backgroundImage: { - 'enchanted-forest': "url('img/website-bg.svg')", 'fireflies': "url('img/website-bg2.png')", 'plus-icon': "url('img/icons/plus.png')", 'groundboi': "url('img/sticker2-no_border.png')", From 0fe3042fdd57be21390f363c06237bfc4de21705 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Oct 2023 20:32:36 -0400 Subject: [PATCH 3/4] Add navigation link for the new Tracks section --- index.html | 19 ++++++++++++++----- styles.css | 20 ++++++++------------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index 49c0537..68a83bf 100644 --- a/index.html +++ b/index.html @@ -17,6 +17,7 @@

DandyHacks ‘23

@@ -59,10 +60,12 @@

November 3-5

-
-

What is DandyHacks?

+

+
+ What is DandyHacks? +

DandyHacks is the University of Rochester’s annual 42-hour long @@ -84,7 +87,10 @@

What is DandyHacks?

-

Tracks

+

+
+ Tracks +

Choose one track to submit your project into. Each track will have three top winners, and each project may only win in one track. Each @@ -209,8 +215,11 @@

FAQS

-