Skip to content

Commit

Permalink
Merge pull request #6 from ThatSealgair/main
Browse files Browse the repository at this point in the history 
Fixed minor issues
  • Loading branch information
@ThatSealgair
ThatSealgair authored Jan 28, 2023
2 parents 7f67ad0 + 8ba5f48 commit 1a67665
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="/exec_page/exec_2023.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
1 change: 1 addition & 0 deletions blog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
1 change: 1 addition & 0 deletions competitions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
1 change: 1 addition & 0 deletions events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
9 changes: 4 additions & 5 deletions exec_page/exec_2020.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<head>
<style type="text/css">
#page-wrapper {
background-image: url("images/vishnu-mohanan-pfR18JNEMv8-unsplash.jpg");
background-image: url("/images/vishnu-mohanan-pfR18JNEMv8-unsplash.jpg");
background-attachment: fixed;
}
</style>
Expand All @@ -18,7 +18,7 @@
href="/images/logos/SquareLogo-favicon.png"
type="image/x-icon"
/>
<meta charset="utf-8" />
<meta charset="utf-8" /
<meta
name="viewport"
content="width=device-width, initial-scale=1, user-scalable=no"
Expand Down Expand Up @@ -46,7 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="/index.html">Home</a></li>
<li><a href="/about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="/blog.html">Blog</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down Expand Up @@ -89,9 +89,8 @@ <h3 class="major">The 2020 UQ MARS Executive Team</h3>
<span class="image fit"
><img src="/images/exec/2020/Cameron_Stroud.jpg"
/>
<caption>Cameron Stroud - <b>President</b></caption>
<caption>Cameron Stroud - <b>President</b></caption></span>
<caption><em>Cameron coordinates the club's executive team and handles communication between UQ MARS and the Student Union.</em></caption>
</span>
</div>
<div class="col-4">
<span class="image fit"
Expand Down
5 changes: 2 additions & 3 deletions exec_page/exec_2021.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="/index.html">Home</a></li>
<li><a href="/about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="/blog.html">Blog</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down Expand Up @@ -89,9 +89,8 @@ <h3 class="major">The 2021 UQ MARS Executive Team</h3>
<span class="image fit"
><img src="/images/exec/2021/Joshua_Lai.jpg"
/>
<caption>Joshua Lai - <b>President</b></caption>
<caption>Joshua Lai - <b>President</b></caption></span>
<caption><em>Joshua coordinates the club's executive team and handles communication between UQ MARS and the Student Union.</em></caption>
</span>
</div>
<div class="col-4">
<span class="image fit"
Expand Down
7 changes: 3 additions & 4 deletions exec_page/exec_2022.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="/index.html">Home</a></li>
<li><a href="/about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="/blog.html">Blog</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down Expand Up @@ -89,16 +89,15 @@ <h3 class="major">The 2022 UQ MARS Executive Team</h3>
<span class="image fit"
><img src="/images/exec/2022/Joshua_Lai.png"
/>
<caption>Joshua Lai - <b>President</b></caption>
<caption>Joshua Lai - <b>President</b></caption></span>
<caption><em>Joshua coordinates the club's executive team and handles communication between UQ MARS and the Student Union.</em></caption>
</span>
</div>
<div class="col-4">
<span class="image fit"
><img src="/images/exec/2022/Shanker_Dorairajan.png" alt=""
/>
<caption>Shanker Dorairajan - <b>Secretary</b></caption></span>
<caption><em></em></caption>
<caption><em>Shanker concentrates on the administration of the club and ensures meetings run smoothly, creating agendas and taking minutes. He also handles all official correspondence.</em></caption>
</div>
<div class="col-4">
<span class="image fit"
Expand Down
15 changes: 7 additions & 8 deletions exec_page/exec_2023.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="/index.html">Home</a></li>
<li><a href="/about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="/blog.html">Blog</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down Expand Up @@ -134,6 +134,12 @@ <h3 class="major">The 2023 UQ MARS Executive Team</h3>
/>
<caption>Jet Garcia - <b>Marketing</b></caption></span>
</div>
<div class="col-4">
<span class="image fit"
><img src="/images/exec/2022/Kelly_Zhou.png" alt=""
/>
<caption>Kelly Zhou - <b>Branding Officer</b></caption></span>
</div>
<div class="col-4">
<span class="image fit"
><img src="/images/exec/2023/Binara Wasala.jpg" alt=""
Expand Down Expand Up @@ -170,13 +176,6 @@ <h3 class="major">The 2023 UQ MARS Executive Team</h3>
/>
<caption>Shanker Dorairajan - <b>General Exec</b></caption></span>
</div>

<div class="col-4">
<span class="image fit"
><img src="/images/exec/2022/Kelly_Zhou.png" alt=""
/>
<caption>Kelly Zhou - <b>Branding Officer</b></caption></span>
</div>
<div class="col-4">
<span class="image fit"
>
Expand Down
1 change: 1 addition & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="projects.html">Projects</a></li>
Expand Down
1 change: 1 addition & 0 deletions projects.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
1 change: 1 addition & 0 deletions signup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
Expand Down
1 change: 1 addition & 0 deletions tutorials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h2>Menu</h2>
<ul class="links">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About Us</a></li>
<li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
<li><a href="events.html">Events</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="projects.html">Projects</a></li>
Expand Down

0 comments on commit 1a67665

Please sign in to comment.