Skip to content

Commit 657d327

Browse files
authored
Merge pull request #1044 from codeRIT/bh-1032
Navbar + Footer fixes
2 parents 32b95ab + d3e89e3 commit 657d327

2 files changed

Lines changed: 40 additions & 26 deletions

File tree

index.html

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,31 @@ <h1>Leadership Team</h1>
362362
</section>
363363
<footer>
364364
<div id="footer-content">
365-
<h2>Contact Us</h2>
366-
<p>hello@coderit.org</p>
367-
<a href="https://twitter.com/coderit" target="_blank">
368-
<i class="fab fa-twitter"></i>
369-
</a>
370-
<a href="https://www.facebook.com/brickhackrit" target="_blank">
371-
<i class="fab fa-facebook"></i>
372-
</a>
373-
<a href="https://www.instagram.com/code.rit/" target="_blank">
374-
<i class="fab fa-instagram"></i>
375-
</a>
376-
<a href="https://github.com/codeRIT" target="_blank">
377-
<i class="fab fa-github"></i>
378-
</a>
379-
<br />
380-
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct | </a>
381-
<a href="https://www.rit.edu/academicaffairs/policiesmanual/c070" target="_blank">privacy policy</a>
382-
<p>copyright &#169; 2020 codeRIT</p>
365+
<div>
366+
<h2>contact us</h2>
367+
<p>hello@coderit.org</p>
368+
</div>
369+
<div>
370+
<a href="https://twitter.com/coderit" target="_blank">
371+
<i class="fab fa-twitter"></i>
372+
</a>
373+
<a href="https://www.facebook.com/brickhackrit" target="_blank">
374+
<i class="fab fa-facebook"></i>
375+
</a>
376+
<a href="https://www.instagram.com/code.rit/" target="_blank">
377+
<i class="fab fa-instagram"></i>
378+
</a>
379+
<a href="https://github.com/codeRIT" target="_blank">
380+
<i class="fab fa-github"></i>
381+
</a>
382+
</div>
383+
<div>
384+
<p>
385+
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct | </a>
386+
<a href="https://www.rit.edu/academicaffairs/policiesmanual/c070" target="_blank">privacy policy</a>
387+
</p>
388+
<p>copyright &#169; 2020 codeRIT</p>
389+
</div>
383390
</div>
384391
</footer>
385392
<!-- This is where Parcel imports are located! (SASS, etc.) -->

sass/main.scss

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,12 @@ nav {
127127

128128
#logo {
129129
width: 100px;
130-
height: 100px;
131130
}
132131

133132
#mlh-badge {
134-
// TODO: Needs sizing/overflow fix
133+
align-self: flex-start;
135134
width: 100px;
136-
height: 100px;
135+
height: 0;
137136
}
138137
}
139138

@@ -637,20 +636,28 @@ footer {
637636
overflow-x: clip;
638637

639638
#footer-content {
639+
display: flex;
640+
flex-direction: column;
641+
justify-content: space-around;
642+
640643
width: 400px;
641-
height: 240px;
644+
height: 235px;
642645
margin: auto;
643-
padding: 30px;
646+
padding: 15px;
644647
text-align: center;
645648

646-
p, a, i {
647-
margin-bottom: 10px;
649+
h2 {
650+
margin-bottom: -5px;
651+
}
652+
653+
p {
654+
font-size: 1em;
648655
}
649656

650657
// FA brand icons
651658
i {
652659
font-size: 3em;
653-
padding-right: 10px;
660+
padding: 0px 5px;
654661
}
655662
}
656663
}

0 commit comments

Comments
 (0)