Skip to content

Commit

Permalink
Merge pull request #24 from RUMblebots-Software/team2023
Browse files Browse the repository at this point in the history
team update 2023
  • Loading branch information
edimarvalentin authored Oct 15, 2023
2 parents 0a0b5a1 + 4d08c54 commit 79d006c
Show file tree
Hide file tree
Showing 16 changed files with 547 additions and 453 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/firebase-hosting-merge.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/firebase-hosting-pull-request.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/webpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: '18.x'
Expand Down
14 changes: 4 additions & 10 deletions src/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
<a class="mx-3 navbar-brand d-none d-md-block" href="index.html">
<img id="logo" src="/src/img/rumblebots.png" height="70" alt="navbar-logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
Expand Down Expand Up @@ -239,7 +240,6 @@
</div>
</div>
</div>
<hr class="border">
</div>
<!--Departments Info-->
<section>
Expand Down Expand Up @@ -352,8 +352,8 @@
</div>
</div>
</div>

</div>

</div>
</section>
<!--Bot Info-->
Expand Down Expand Up @@ -510,14 +510,8 @@
<div class="col-xs-12 col-md-6 text-center">
<p class="h3 mb-3"><i class="fa-solid fa-earth-americas green-light-rumble"></i> Contact</p>
<ul class="list-unstyled list-inline">
<li class="list-inline-item"><a href="https://www.facebook.com/UprmRumblebots"><i
class="fa-brands fa-facebook blue-facebook fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://www.instagram.com/rumblebotsuprm/"><i
class="fa-brands fa-instagram pink-instagram fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://twitter.com/rumblebotsuprm"><i
class="fa-brands fa-twitter blue-twitter fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://www.linkedin.com/company/rumblebots/"><i
class="fa-brands fa-linkedin blue-linkedin fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://github.com/RUMblebots-Software"><i
class="fa-brands fa-github black-github fa-2xl"></i></a></li>
</ul>
Expand Down
6 changes: 0 additions & 6 deletions src/html/meet-the-bots.html
Original file line number Diff line number Diff line change
Expand Up @@ -993,14 +993,8 @@
<div class="col-xs-12 col-md-6 text-center">
<p class="h3 mb-3"><i class="fa-solid fa-earth-americas green-light-rumble"></i> Contact</p>
<ul class="list-unstyled list-inline">
<li class="list-inline-item"><a href="https://www.facebook.com/UprmRumblebots"><i
class="fa-brands fa-facebook blue-facebook fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://www.instagram.com/rumblebotsuprm/"><i
class="fa-brands fa-instagram pink-instagram fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://twitter.com/rumblebotsuprm"><i
class="fa-brands fa-twitter blue-twitter fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://www.linkedin.com/company/rumblebots/"><i
class="fa-brands fa-linkedin blue-linkedin fa-2xl"></i></a></li>
<li class="list-inline-item"><a href="https://github.com/RUMblebots-Software"><i
class="fa-brands fa-github black-github fa-2xl"></i></a></li>
</ul>
Expand Down
Loading

0 comments on commit 79d006c

Please sign in to comment.