Skip to content

Commit

Permalink
Merge pull request #103 from HackNC/dev-phase
Browse files Browse the repository at this point in the history
consistency
  • Loading branch information
aryasalian authored Oct 29, 2024
2 parents d14b061 + ba10164 commit 608bbac
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
8 changes: 3 additions & 5 deletions meet-the-team/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,15 @@
<li>
<a href="../index.html">
<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>
</li>
<!-- <li id="nav-section"><a href="https://hacknc.com/live/">Live</a></li> -->
<li id="nav-section"><a href="https://hacknc.com/live/">Live</a></li>
<li id="nav-section"><a href="../index.html#about">About</a></li>
<li id="nav-section"><a href="../index.html#faq">FAQ</a></li>
<li id="nav-section"><a href="../index.html#sponsors">Sponsors</a></li>
<li id="nav-section"><a href="./index.html">Meet the Team</a></li>
</ul>
</nav>

Expand All @@ -47,11 +46,10 @@

<div class="hamburger-menu">
<a href="../index.html">Home</a>
<!-- <a href="https://hacknc.com/live/">Live</a> -->
<a href="https://hacknc.com/live/">Live</a>
<a href="../index.html#about">About</a>
<a href="../index.html#faq">FAQ</a>
<a href="../index.html#sponsors">Sponsors</a>
<a href="../meet-the-team/index.html">Meet the Team</a>
</div>


Expand Down
6 changes: 1 addition & 5 deletions static/css/live.css
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ nav .home {
}

nav .home img {
height: 40px;
height: 60px;
margin-right: 10px;
}

Expand Down Expand Up @@ -1320,10 +1320,6 @@ a {
text-decoration: none;
}

a:hover {
text-decoration: underline;
}

.container {
display: flex;
flex-wrap: wrap;
Expand Down
11 changes: 5 additions & 6 deletions static/css/meet-the-team.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@ body {
a {
color: #0A0058;
}
a:hover {
text-decoration: underline;

a:hover{
text-decoration: underline;
}



h1 {
font-family: 'Orbitron', sans-serif;
font-weight: bold;
Expand Down Expand Up @@ -324,7 +323,7 @@ nav {
}

nav .home img {
height: 40px;
height: 60px;
margin-right: 10px;
}

Expand Down

0 comments on commit 608bbac

Please sign in to comment.