Skip to content

Commit

Permalink
Merge pull request #106 from HackNC/dev-phase
Browse files Browse the repository at this point in the history 
Dev phase
  • Loading branch information
@aryasalian
aryasalian authored Oct 30, 2024
2 parents 6bcd902 + be2c7fc commit 60bf5cb
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 39 deletions.
4 changes: 2 additions & 2 deletions live/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</li>
<li><a class="selected" href="/live">Live</a></li>
<li><a href="/live/schedule">Schedule</a></li>
<!-- <li><a href="/live/prizes">Tracks/Prizes</a></li> -->
<li><a href="/live/prizes">Tracks/Prizes</a></li>
<li><a href="/live/resources">Resources</a></li>
</ul>
</nav>
Expand All @@ -56,7 +56,7 @@
<a href="/">Home</a>
<a href="/live">Live</a>
<a href="/live/schedule">Schedule</a>
<!--<a href="/live/prizes">Tracks/Prizes</a>-->
<a href="/live/prizes">Tracks/Prizes</a>
<a href="/live/resources">Resources</a>
</div>

Expand Down
54 changes: 31 additions & 23 deletions live/prizes/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,26 @@

<meta property="og:url" content="https://hacknc.com/">
<meta property="og:type" content="website">
<meta property="og:title" content="HackNC 2023">
<meta property="og:title" content="HackNC 2024">
<meta property="og:description" content="UNC-Chapel Hill's annual fall hackathon" />

<title>HackNC 2024</title>
<link rel="icon" type="image/png" sizes="32x32" href="../../static/assets/images/halloween-art/purple-favicon.jpg">
<link rel="icon" type="image/png" sizes="32x32" href="/static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png">

<!-- Load Font -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link
href="https://fonts.googleapis.com/css2?family=Lora:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap"
rel="stylesheet">

href="https://fonts.googleapis.com/css2?family=Orbitron:wght@700&family=Titillium+Web:wght@400;600&family=Urbanist:ital,wght@0,400;1,400&display=swap"
rel="stylesheet">
<script src="https://use.fontawesome.com/28dbc0dc5a.js"></script>
<script src="https://kit.fontawesome.com/95c7888398.js" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.5.1.js"
integrity="sha256-QWo7LDvxbWT2tbbQ97B53yJnYU3WhH/C8ycbRAkjPDc=" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.5.1.js" integrity="sha256-QWo7LDvxbWT2tbbQ97B53yJnYU3WhH/C8ycbRAkjPDc=" crossorigin="anonymous"></script>
<script src="static/js/hambuger-menu.js"></script>
<link rel="stylesheet" href="../../static/css/live.css">
</head>

<body>
<body style="background-image: url('/static/assets/images/star-pattern.svg');">

<main id="content container">

Expand All @@ -39,7 +37,7 @@
<li>
<a href="/">
<div class="home">
<img src="/static/assets/images/halloween-art/ram.svg" />
<img src="/static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png" />
HackNC
</div>
</a>
Expand Down Expand Up @@ -71,32 +69,42 @@ <h4>There are 2 HackNC tracks: (1) General and (2) Beginner. Each track has a 1s
<h2>General and Beginner Track Prizes</h2>
<div class="card">
<h3>First Place</h3>
<p>Apple AirPods (2nd Generation)
<p>Mac Mini / iPad Air 11-inch M2 / Remarkable tablet
</p>
</div>
<div class="card">
<h3>Runner-up</h3>
<p>Amazon Echo Dot (5th Generation)
<p>Sony Headphones
</p>
</div>

<div class="card">
<h3>Best UX Hack</h3>
<p>Drawing Tablet HUION Inspiroy H640P Graphics Tablet with Battery-Free Stylus
<h3>Best Space Hack</h3>
<p>Legos
</p>
</div>
<!-- Grand Prize -->
<div class="card">
<h3>Best Game hack</h3>
<p>Logitech G413 TKL SE Mechanical Gaming Keyboard</p>
<h3>Best Gaming hack</h3>
<p>Switch</p>
</div>
<div class="card">
<h3>Best Community Hack</h3>
<p> Scooter
</p>
</div>
<div class="card">
<h3>Best Mobile Hack</h3>
<p> Tile Mate 2-Pack. Bluetooth Tracker
<h3>Best iOS Hack</h3>
<p> Airpods
</p>
</div>
<div class="card">
<h3>Best UNC Hack</h3>
<p> Signed Jersey
</p>
</div>

<h2>Costume Contest</h2>
<!-- <h2>Costume Contest</h2>
<div class="card">
<h3>First Place</h3>
<p>
Expand All @@ -105,12 +113,12 @@ <h3>First Place</h3>
considered.
</p>
</div>
</div> -->
</div>

<div class="container">
<!-- Sponsor Prizes -->
<h2>Sponsor Prizes</h2>
<!-- <h2>Sponsor Prizes</h2>
<div class="card">
<h3>Best Hack to Support Diversity, Inclusion & Belonging</h3>
<p>Presented by CapTech<br>
Expand Down Expand Up @@ -140,10 +148,10 @@ <h3>Best Infosys Hack</h3>
<p>Presented by Infosys <br>
Infosys InStep Goodie Bag, including Amazon Fire Stick
</p>
</div>
</div> -->
<!-- ktp prize -->

<div class="card">
<!-- <div class="card">
<h3>Best Cybersecurity Hack</h3>
<p>Presented by Cisco <br>
JBL Flip 5 with Hardshell Case
Expand All @@ -166,7 +174,7 @@ <h3><a href="https://www.patientsafetytech.com/">Patient Safety Technology Chall
<p>Presented by Pittsburgh Patient Safety<br>
$100 Amazon gift cards
</p>
</div>
</div> -->
</div>


Expand Down
4 changes: 2 additions & 2 deletions live/resources/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</li>
<li><a href="/live">Live</a></li>
<li><a href="/live/schedule">Schedule</a></li>
<!--<li><a href="/live/prizes">Tracks/Prizes</a></li>-->
<li><a href="/live/prizes">Tracks/Prizes</a></li>
<li><a class="selected" href="/live/resources">Resources</a></li>
</ul>
</nav>
Expand All @@ -55,7 +55,7 @@
<a href="/">Home</a>
<a href="/live">Live</a>
<a href="/live/schedule">Schedule</a>
<!--<a href="/live/prizes">Tracks/Prizes</a>-->
<a href="/live/prizes">Tracks/Prizes</a>
<a href="/live/resources">Resources</a>
</div>

Expand Down
4 changes: 2 additions & 2 deletions live/schedule/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</li>
<li><a href="/live">Live</a></li>
<li><a class="selected" href="/live/schedule">Schedule</a></li>
<!-- <li><a href="/live/prizes">Tracks/Prizes</a></li> -->
<li><a href="/live/prizes">Tracks/Prizes</a></li>
<li><a href="/live/resources">Resources</a></li>
</ul>
</nav>
Expand All @@ -54,7 +54,7 @@
<a href="/">Home</a>
<a href="/live">Live</a>
<a href="/live/schedule">Schedule</a>
<!--<a href="/live/prizes">Tracks/Prizes</a>-->
<a href="/live/prizes">Tracks/Prizes</a>
<a href="/live/resources">Resources</a>
</div>

Expand Down
21 changes: 11 additions & 10 deletions static/css/live.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@
}
}



h2 {
text-align: center;
}
Expand Down Expand Up @@ -660,12 +658,12 @@ nav ul a.selected {
}

#links div:first-child {
border-bottom: 1px solid;
border-bottom: 1px solid #0A0058;
}

#links div:nth-child(2) {
border-right: none;
border-bottom: 1px solid;
border-bottom: 1px solid #0A0058;
}

#links div:nth-child(3) {
Expand Down Expand Up @@ -697,8 +695,9 @@ nav ul a.selected {
#prizes h2,
#resources h2 {
width: 100%;
text-align: left;
margin-bottom: 0;
text-align: center;
color: #FFED7B;
margin-bottom: 10px;
}

#prizes .container,
Expand All @@ -711,9 +710,9 @@ nav ul a.selected {
#resources .card {
flex: 1 0 30%;
box-sizing: border-box;
background-color: #D5CAEF;
color: #4f3426;
border: 1px solid #4f3426;
background-color: #030139;
color: #FFF9D6;
/* border: 1px solid #4f3426; */
margin: 1%;
}

Expand Down Expand Up @@ -765,6 +764,8 @@ nav ul a.selected {

#prizes .card p,
#resources .card p {
text-align: center;
margin-top: 10px;
margin-bottom: 0;
}

Expand Down Expand Up @@ -1332,7 +1333,7 @@ a {
.card {
background-color: #0A0058;
border-radius: 10px;
box-shadow: 0px 0px 15px 1px #FFED7B;
/* box-shadow: 0px 0px 15px 1px #FFED7B; */
padding: 15px;
margin: 15px;
flex: 0 0 47.5%;
Expand Down

0 comments on commit 60bf5cb

Please sign in to comment.