Skip to content

new changes #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Khushhhi wants to merge 6 commits into
base: master
Choose a base branch
from
Open

new changes #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8534442
removed inactive socials
Khushhhi Oct 21, 2023
7ac2d75
removed blog from navbar
Khushhhi Oct 21, 2023
86abda9
changed navbar color
Khushhhi Oct 21, 2023
ce6d689
added new members
Khushhhi Oct 21, 2023
24e9bfa
past members updated
Khushhhi Oct 21, 2023
6218cdf
removed what's new
Khushhhi Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,43 @@
<!-- Footer -->
<footer class="page-footer font-small mdb-color lighten-3 pt-2">
<div class="container">
<div class="row">
<div class="col-md-2 col-lg-10 ">
<div class="s-m regular-s-m">
<ul class="list-unstyled">
<br>
<li>
<p><a href=""><i class="fa fa-home fa-1x"></i></a> University of Alberta ETLC 3rd
Floor – Room
E3-002</p>
</li>
<li>
<p><a href="{% link Contact.html %}"><i class="fa fa-envelope fa-1x"></i></a>{{ site.emails.info }}</p>
</li>
<li>
<p><a href=""><i class="fas fa-shipping-fast"></i></a> 11th floor DICE,
9211-116 Street NW
Edmonton, Alberta, Canada T6G 1H9</p>
</li>
</ul>
</div>
</div>
<!-- Grid column -->
<hr class="clearfix w-100 d-md-none">
<!-- Grid column -->
<div class="col-md-2 col-lg-2 text-center mx-auto my-4">
<!-- Social buttons -->
<h5 class="font-weight-bold text-uppercase mb-4">Follow Us!</h5>
<div class="container">
<div class="row">
<div class="col-md-2 col-lg-10 ">
<div class="s-m regular-s-m">
<ul class="list-unstyled">
<br>
<li>
<p><a href=""><i class="fa fa-home fa-1x"></i></a> University of Alberta ETLC 3rd Floor – Room E3-002
</p>
</li>
<li>
<p><a href="{% link Contact.html %}"><i class="fa fa-envelope fa-1x"></i></a>{{ site.emails.info }}</p>
</li>
<li>
<p><a href=""><i class="fas fa-shipping-fast"></i></a> 11th floor DICE, 9211-116 Street NW Edmonton, Alberta, Canada T6G 1H9</p>
</li>
</ul>
</div>
</div>
<!-- Grid column -->
<hr class="clearfix w-100 d-md-none">
<!-- Grid column -->
<div class="col-md-2 col-lg-2 text-center mx-auto my-4">
<!-- Social buttons -->
<!-- <h5 class="font-weight-bold text-uppercase mb-4">Follow Us!</h5>
<div class="s-m">
<a id="animatedFacebook" href="https://www.facebook.com/uaarg/"><i class="fab fa-facebook"></i></a>
<a id="animatedYoutube" href="https://www.youtube.com/user/UAARG"><i class="fab fa-youtube"></i></a>
</div>
<br>
<a href="{% link Contact.html %}"><img src="{% link assets/images/Join_Button.jpg %}" alt="Join Us"
class="footerJoinButton"></a>
</div>
class="footerJoinButton"></a> -->
</div>
</div>
</div>
</div>
<!-- Copyright -->
<div class="footer-copyright text-center py-3" style="font-size: 20px;">
<p style="color: white">© 2022 Copyright: University of Alberta Aerial Robotics Group</p>
</div>
</div>
</div>
<!-- Copyright -->
<div class="footer-copyright text-center py-3" style="font-size: 20px;">
<p style="color: white">© 2022 Copyright: University of Alberta Aerial Robotics Group</p>
</div>
</footer>
</footer>
71 changes: 35 additions & 36 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
<!-- Website Header -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="{% link assets/images/uaarg.jpg %}" alt="UAARG Logo" width="50" height="50">
<b class="fs-2 align-middle">UAARG</b>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="{% link assets/images/uaarg.jpg %}" alt="UAARG Logo" width="50" height="50">
<b class="fs-2 align-middle">UAARG</b>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/about">About</a>
</li>
<li class="nav-item">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/about">About</a>
</li>
<!-- <li class="nav-item">
<a class="nav-link" href="/blog">Blog</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/members">Members</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/competitions">Competitions</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/sponsors">Sponsors</a>
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="/social">Social&nbspMedia</a>
</li>
<li class="nav-item">
<a class="nav-link text-primary fw-bold" href="/contact">Contact&nbspUs</a>
</li>
</ul>
</li> -->
<li class="nav-item">
<a class="nav-link" href="/members">Members</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/competitions">Competitions</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/sponsors">Sponsors</a>
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="/social">Social&nbspMedia</a>
</li>
<li class="nav-item">
<a class="nav-link text-primary fw-bold" href="/contact">Contact&nbspUs</a>
</li>
</ul>
</div>
</div>
</div>
</nav>
Loading