Skip to content

Commit

Permalink
Merge branch 'dev-phase' into small-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@vvkash
vvkash authored Oct 23, 2024
2 parents f45e056 + f2a8bd6 commit f3e14e7
Show file tree
Hide file tree
Showing 43 changed files with 1,140 additions and 604 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
53 changes: 30 additions & 23 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<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/Splash/(splash) rocket animation final.gif">
<title>HackNC 2024</title
<link rel="icon" type="image/png" sizes="32x32" href="./static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png">
<link rel="icon" type="image/png" sizes="32x32" href="./static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png">

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -38,15 +39,15 @@
<li>
<a href="#home">
<div class="home">
<span><img src="/static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png" />
<span><img src="static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png" />
HackNC</span>
</div>
</a>
</li>
<li id="nav-section"><a href="#about">About</a></li>
<li id="nav-section"><a href="#faq">FAQ</a></li>
<li id="nav-section"><a href="#sponsors">Sponsors</a></li>
<!--<li id="nav-section"><a href="meet-the-team/index.html">Meet The Team</a></li>-->
<li id="nav-section"><a href="meet-the-team/index.html">Meet The Team</a></li>
</ul>
</nav>

Expand All @@ -59,21 +60,21 @@
<a href="#about">About</a>
<a href="#faq">FAQ</a>
<a href="#sponsors">Sponsors</a>
<!--<a href="meet-the-team/index.html">Meet The Team</a>-->
<a href="meet-the-team/index.html">Meet The Team</a>
</div>

<!-- Logo and header -->

<div class="scroll-track">
<div class="sticky-div">
<div class="space-station-frame">
<img id="astronaut-ram" src="/static/assets/images/dolly-zoom-space-art/(border) ram astronaut.svg" />
<img id="astronaut-ram" src="static/assets/images/dolly-zoom-space-art/(border) ram astronaut.svg" />
<img id="ctrl-panel"
src="/static/assets/images/dolly-zoom-space-art/(border) left wall control panel.svg" />
<img id="pipes" src="/static/assets/images/dolly-zoom-space-art/(border) right wall pipes.svg" />
<img id="id-card" src="/static/assets/images/dolly-zoom-space-art/(border) name tag.svg" />
<img id="screen" src="/static/assets/images/dolly-zoom-space-art/(border) constellation screen.svg" />
<img id="coffee" src="/static/assets/images/dolly-zoom-space-art/(border) space coffee.svg" />
src="static/assets/images/dolly-zoom-space-art/(border) left wall control panel.svg" />
<img id="pipes" src="static/assets/images/dolly-zoom-space-art/(border) right wall pipes.svg" />
<img id="id-card" src="static/assets/images/dolly-zoom-space-art/(border) name tag.svg" />
<img id="screen" src="static/assets/images/dolly-zoom-space-art/(border) constellation screen.svg" />
<img id="coffee" src="static/assets/images/dolly-zoom-space-art/(border) space coffee.svg" />
<div class="banner-info">
<h2 class="date">{ November 2 - 3, 2024 }</h2>
<button class="involve-button hide-button register-button"><a
Expand All @@ -87,8 +88,8 @@ <h2 class="date">{ November 2 - 3, 2024 }</h2>
</div>
</div>
<div class="starry-sky">
<img id="ram-planet" src="/static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png" />
<img id="HackNC-text" src="/static/assets/images/Splash/Copy of Text-DarkLightStar-WhiteFill.png" />
<img id="ram-planet" src="static/assets/images/Splash/Copy of HackNC2024 Logo 2.0 .png" />
<img id="HackNC-text" src="static/assets/images/Splash/Copy of Text-DarkLightStar-WhiteFill.png" />
</div>
</div>
<div class="sticky-over">
Expand All @@ -97,7 +98,7 @@ <h2 class="date">{ November 2 - 3, 2024 }</h2>
</div>
</div>

<img id="splash-about-transition" src="/static/assets/images/Transitions/splash to about transition.svg"></img>
<img id="splash-about-transition" src="static/assets/images/Transitions/splash to about transition.svg"></img>
<a class="nav-anchor" id="about"></a>

<!-- About -->
Expand All @@ -120,7 +121,7 @@ <h1 class="about-heading">What is HackNC?</h1>
target="_blank">Explore Past Projects</a></button>
</div>
</div>
<img id="about-graphic" src="/static/assets/images/About/planet gif revised.gif"
<img id="about-graphic" src="static/assets/images/About/planet gif revised.gif"
alt="Planets SVG" />

</div>
Expand All @@ -129,9 +130,9 @@ <h1 class="about-heading">What is HackNC?</h1>

<!-- About to FAQ Transition -->
<div class="about-to-faq">
<img class="mars" src="/static/assets/images/Transitions/Mars.svg" alt="mars">
<img class="saturn" src="/static/assets/images/Transitions/Saturn.svg" alt="saturn">
<img class="neptune" src="/static/assets/images/Transitions/Neptune.svg" alt="neptune">
<img class="mars" src="static/assets/images/Transitions/Mars.svg" alt="mars">
<img class="saturn" src="static/assets/images/Transitions/Saturn.svg" alt="saturn">
<img class="neptune" src="static/assets/images/Transitions/Neptune.svg" alt="neptune">
</div>

<!-- FAQ -->
Expand Down Expand Up @@ -177,22 +178,28 @@ <h1 class="sponsors-header">Sponsors</h1>
src=''></a> -->
<a target="_blank" href='https://www.bandwidth.com/careers/internship/'>
<img alt="Bandwidth logo" id="Bandwidth-logo" class='sponsor-image'
src='/static/assets/images/sponsors/Bandwidth.png'></a>
src='static/assets/images/sponsors/Bandwidth.png'></a>
<a target="_blank" href='https://www.capitalonecareers.com/'>
<img alt="CapitalOne logo" id="CapitalOne-logo" class='sponsor-image'
src='/static/assets/images/sponsors/capitalone.png'></a>
src='static/assets/images/sponsors/capitalone.png'></a>
<a target="_blank" href='https://www.infosys.com/'>
<img alt="Infosys logo" id="Infosys-logo" class='sponsor-image'
src='/static/assets/images/sponsors/infosys.png'></a>
src='static/assets/images/sponsors/infosys.png'></a>
<a target="_blank" href='https://jobs.fidelity.com/'>
<img alt="Fidelity logo" id="Fidelity-logo" class='sponsor-image'
src='/static/assets/images/sponsors/fidelity.png'></a>
src='static/assets/images/sponsors/fidelity.png'></a>
<a target="_blank" href='https://www.lowes.com/'>
<img alt="Lowes logo" id="Lowes-logo" class='sponsor-image'
src='/static/assets/images/sponsors/lowes.png'></a>
src='static/assets/images/sponsors/lowes.png'></a>
<a target="_blank" href='https://www.pendo.io/'>
<img alt="Pendo logo" id="Pendo-logo" class='sponsor-image'
src='/static/assets/images/sponsors/pendo.png'></a>
<a target="_blank" href='https://www.standoutstickers.com/?srsltid=AfmBOopW_XB1Mb3Rrq2gga2zVzrm2p86MKGVDvQWlXDqxP4oHtHJmcKS'>
<img alt="StandOutStickers logo" id="stand-out-stickers-logo" class='sponsor-image'
src='/static/assets/images/sponsors/stand-out-stickers-logo.svg'></a>
<a target="_blank" href='https://www.nutanix.com/'>
<img alt="Nutanix logo" id="nutanix-logo" class='sponsor-image'
src='/static/assets/images/sponsors/Nutanix-Logo-Charcoal-Gray-Digital (1).png'></a>
<!--<a target="_blank" href='https://jobs.cisco.com/jobs/SearchJobs/internship'>
<img alt="Cisco logo" id="Cisco-logo" class='sponsor-image'
src=''></a>
Expand Down
7 changes: 4 additions & 3 deletions live/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

<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">
Expand All @@ -38,7 +38,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 All @@ -49,6 +49,7 @@
<li><a href="/live/resources">Resources</a></li>
</ul>
</nav>

<!-- Hamburger Menu -->
<input type="checkbox" class="hamburger-btn fa-solid fa-bars" id="hamburger-btn" />
<div class="hamburger-menu">
Expand Down
Loading

0 comments on commit f3e14e7

Please sign in to comment.