Skip to content

Commit

Permalink
Merge pull request #23 from UTSA-ACM/feature/april-fools-2022
Browse files Browse the repository at this point in the history
Alaskan Coastal Mammals [URGENT UPDATE]
  • Loading branch information
Zaqttack authored Apr 1, 2022
2 parents 84cb89e + 54908c2 commit 64ea3a1
Show file tree
Hide file tree
Showing 26 changed files with 401 additions and 307 deletions.
49 changes: 30 additions & 19 deletions _includes/about_section.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,26 @@ <h2>About ACM</h2>

<div class="row">
<div class="col-xl-6 col-lg-7" data-aos="fade-right">
<img src="assets/img/about-img.jpg" class="img-fluid" alt="">
<img src="assets/img/otter-about.jpg" class="img-fluid" alt="">
</div>
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
<p id="about-statement" data-aos="fade-up">
The Association for Computing Machinery at UTSA is dedicated to giving members and students the
opportunity to gain experience, network, socialize, learn, and grow outside of the classroom in
all fields of technology and computing.
The Alaskan Coastal Mammals at UTSA is part of the Mustelid family of animals which also includes badgers, pine martens and weasels. There are 13 species of otter around the world and many of them are endangered. Use the links to explore the different species and find out more about otters in other parts of the world.
</p>
<div class="icon-box" data-aos="fade-up">
<i class='bx bx-info-circle bx-tada'></i>
<h4>Organization</h4>
<p>Our chapter is organized to serve students for academic, professional, and social purposes at
UTSA. The Chapter shall be involved with and conduct activities that are included below.</p>
<h4>Why?</h4>
<p>Because our President loves otters.</p>
</div>
<div class="icon-box" data-aos="fade-up">
<i class='bx bx-info-circle bx-tada'></i>
<h4>Where?</h4>
<p>Located on UTSA Campus.</p>
</div>
<div class="icon-box" data-aos="fade-up">
<i class='bx bx-info-circle bx-tada'></i>
<h4>When?</h4>
<p>Yearly.</p>
</div>
</div>
</div>
Expand All @@ -30,36 +37,40 @@ <h4>Organization</h4>
<section id="steps" class="steps section-bg">
<div class="container">

<div class="section-title" data-aos="fade-up">
<h2>Otter Facts</h2>
</div>

<div class="row no-gutters">

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in">
<h4>Engaging</h4>
<p>students in stimulating computing activities</p>
<h4>Love</h4>
<p>Sea otters hold hands while they sleep</p>
</div>

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in" data-aos-delay="100">
<h4>Mentoring</h4>
<p>students for academic and professional success</p>
<h4>Protection</h4>
<p>Otters have the densest fur of all mammals</p>
</div>

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in" data-aos-delay="200">
<h4>Advancing</h4>
<p>the art, science, engineering, and application of information technology</p>
<h4>Strength</h4>
<p>Otters can overpower alligators</p>
</div>

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in">
<h4>Connecting</h4>
<p>students with leaders in the computing field</p>
<h4>Assitive</h4>
<p>Otters have seen helping humans fish</p>
</div>

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in" data-aos-delay="100">
<h4>Encouraging</h4>
<p>the pursuit of career opportunities in computing</p>
<h4>Caring</h4>
<p>Otter mothers wrap their babies in kelp to keep them from floating away</p>
</div>

<div class="col-lg-4 col-md-6 content-item" data-aos="fade-in" data-aos-delay="200">
<h4>Promoting</h4>
<p>the highest professional and ethical standards</p>
<h4>Resourceful</h4>
<p>Otters create and utilize tools</p>
</div>

</div>
Expand Down
5 changes: 3 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ <h4>Useful Links</h4>
<ul>
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}/">Home</a></li>
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link sponsorship.html %}">Sponsorship</a></li>
<li><i class="bx bx-chevron-right"></i><a href="https://video.ibm.com/seaotters">Watch</a></li>
</ul>
</div>

<div class="col-lg-2 col-md-2 footer-links d-none d-md-block">
<!-- <div class="col-lg-2 col-md-2 footer-links d-none d-md-block">
<h4>Our Sub-Organizations</h4>
<ul>
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}/{% link suborg_acmw.html %}">ACM-W</a></li>
Expand All @@ -36,7 +37,7 @@ <h4>Our Sub-Organizations</h4>
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link suborg_rowdyhacks.html %}">RowdyHacks</a></li>
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link suborg_code_quantum.html %}">Code Quantum</a></li>
</ul>
</div>
</div> -->

<div class="col-lg-2 col-md-2 footer-links d-none d-md-block">
<h4>Resources</h4>
Expand Down
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>ACM UTSA</title>

<!-- Favicon -->
<link rel="icon" href="{{ site.baseurl }}/assets/img/logos/favicon.png">
<link rel="icon" href="{{ site.baseurl }}/assets/img/otter-jenelle.png">
<link rel="apple-touch-icon" href="{{ site.baseurl }}/assets/img/logos/apple-touch-icon.png">

<!-- Stylesheets -->
Expand Down
9 changes: 5 additions & 4 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- text logo top left corner-->
<!-- <h1 class="text-light"><a href="index.html">ACM UTSA</a></h1> -->
<!-- image logo top left corner-->
<a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/assets/img/logos/logo.png" alt="ACM Logo" class="img-fluid"></a>
<a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/assets/img/otter-jenelle.png" alt="ACM Logo" class="img-fluid"></a>
</div>

{% if page.title=="home" %}
Expand All @@ -30,7 +30,8 @@
<li class="{{ home }}"><a href="{{ site.baseurl }}/">Home</a></li>
<li class="{{ team }}"><a href="{{ site.baseurl }}{% link team.html %}">Team</a></li>
<li class="{{ calendar }}"><a href="{{ site.baseurl }}{% link calendar.html %}">Calendar</a></li>
<li class="drop-down {{ suborg }}"><a href="">Sub Orgs</a>
<li class="{{ calendar }}"><a href="https://video.ibm.com/seaotters">Watch</a></li>
<!-- <li class="drop-down {{ suborg }}"><a href="">Sub Orgs</a>
<ul>
<li><a href="{{ site.baseurl }}{% link suborg_acmw.html %}">ACM-W</a></li>
<li><a href="{{ site.baseurl }}{% link suborg_icpc.html %}">ACM ICPC</a></li>
Expand All @@ -39,9 +40,9 @@
<li><a href="{{ site.baseurl }}{% link suborg_rowdyhacks.html %}">RowdyHacks</a></li>
<li><a href="{{ site.baseurl }}{% link suborg_code_quantum.html %}">Code Quantum</a></li>
</ul>
</li>
</li> -->
<li class="{{ sponsorship }}"><a href="{{ site.baseurl }}{% link sponsorship.html %}">Sponsorship</a></li>
<li class="{{ donate }}"><a href="{{ site.baseurl }}{% link donate.html %}">Donate</a></li>
<li class="{{ donate }}"><a href="https://gifts.worldwildlife.org/gift-center/gifts/Species-Adoptions/River-Otter.aspx?sc=AWY1800OQ18352A01768RX&gclid=CjwKCAjwopWSBhB6EiwAjxmqDeCnvgAhiVJgH9TDGMQRmJp6F-ulySPKMF813xhGHFG6d7FdjeWqdBoCgh8QAvD_BwE">Donate</a></li>
<li class="drop-down {{ resource }}"><a href="">Resources</a>
<ul>
<li><a href="{{ site.baseurl }}{% link member_new.html %}">Register</a></li>
Expand Down
20 changes: 17 additions & 3 deletions _includes/suborg_section.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,24 @@
<div class="container">

<div class="section-title" data-aos="fade-up">
<h2>Our Sub Organizations</h2>
<h2 style="margin-bottom: 0px;">An Otter Essay</h2>
<h3 style="font-size: 24px; line-height: 26px;">By Mei Sullum</h3>
</div>

<div class="row">
<div class="col-xl-12 col-lg-12 col-md-12 mb-5 mb-lg-0">
<p data-aos="fade-up">
Otters live on all continents except Australia and Antarctica. They can live on land and in the water.
Big otters and their bodies are long. They could be 2-6 feet. They have thick fur, and they have two layers of fur. Their thick fur helps them and keeps them out of the cold water. They have short ears and a small nose. It helps them make sure the water doesn't get into their noses and ears. They have a long tail and it helps them swim fast. Otters eat different foods. They eat animals that live in water like crabs, fish, oysters, and many other animals. Sometimes, they also eat animals that live on land like birds, rabbits, and more.
Otters eat different foods. They eat animals that live in water like crabs, fish, oysters, and many other animals. Sometimes, they also eat animals that live on land like birds, rabbits, and more.
Most of the time the otters live alone, but in some seasons the otters live in small groups. Live otters are really intelligent and sociable. They play along with their voices and the sounds. They have a lot of sounds for different things. For example, if there are otters in a large group and a small otter needs to communicate with her mother, she can use a specific voice and a mother can hear that voice. The voices also help and notify other otters if there is danger.
Otters also communicate through body language. An otter mother can show her child whether she's angry or happy by the way she stands. Otters also communicate through smell. For example, they mark their territory with their feces and then other otters know that this is her place.
A male otter finds a female otter and before they mate, they play through movements. A female otter can give birth between 1-5 puppies at once, and then the mother raises and protects her cubs until she gives birth again, or after one year
</p>
</div>
</div>

<!-- <div class="row">
<div class="col-lg-4 mb-5 mb-lg-0">
<ul class="nav nav-tabs flex-column">
<li class="nav-item" data-aos="fade-right">
Expand Down Expand Up @@ -86,6 +100,6 @@ <h2 class="inline-name">Code Quantum</h2>
</div>
</div>
</div>
</div>
</div> -->
</div>
</section>
28 changes: 14 additions & 14 deletions _includes/team_acm.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Vice President -->
{% assign image="zaquariah-holland.jpg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Zaquariah Holland" %}
{% assign title="Vice President" %}
{% assign linkedin="Zaquariah-Holland" %}
Expand All @@ -28,7 +28,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Secretary -->
{% assign image="seth-zapata.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Seth Zapata" %}
{% assign title="Secretary" %}
{% assign linkedin="sethzapata" %}
Expand All @@ -38,7 +38,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Treasurer -->
{% assign image="christopher-de-leon.jpg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Christopher De Leon" %}
{% assign title="Treasurer" %}
{% assign linkedin="" %}
Expand All @@ -48,7 +48,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- RowdyHacks Director -->
{% assign image="roni-maddox.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Roni Maddox" %}
{% assign title="RowdyHacks Director" %}
{% assign linkedin="" %}
Expand All @@ -58,7 +58,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- ACM-W Director -->
{% assign image="joshua-lazaro.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Joshua Lazaro" %}
{% assign title="ACM-W Director" %}
{% assign linkedin="joshua-lazaro-3096ba196" %}
Expand All @@ -68,7 +68,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Rowdy Creators Director -->
{% assign image="joshua-le.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Joshua Le" %}
{% assign title="Rowdy Creators Director" %}
{% assign linkedin="joshua-le-879407189" %}
Expand All @@ -78,7 +78,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- ICPC Director -->
{% assign image="ruben-andrade.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Ruben Andrade" %}
{% assign title="ICPC Director" %}
{% assign linkedin="" %}
Expand All @@ -88,7 +88,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Bits & Bytes Director -->
{% assign image="finn-bm.jpg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Finn Burmeister-Morton" %}
{% assign title="Bits & Bytes Director" %}
{% assign linkedin="finn-burmeister-morton-2b9b5217a" %}
Expand All @@ -101,7 +101,7 @@ <h2>ACM Team</h2>
ACM COUNCIL
-->
<!-- Public Relations Officer -->
{% assign image="default-pfp.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Mei Sullum" %}
{% assign title="Public Relations Officer" %}
{% assign twitter="" %}
Expand All @@ -110,7 +110,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Media Officer -->
{% assign image="kyle-yuhara.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Kyle Yuhara" %}
{% assign title="Media Officer" %}
{% assign linkedin="" %}
Expand All @@ -120,7 +120,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Projects Officer -->
{% assign image="alex-smith.jpg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Alex Smith" %}
{% assign title="Projects Officer" %}
{% assign linkedin="" %}
Expand All @@ -130,7 +130,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Membership Officer -->
{% assign image="elijah-moya.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Elijah Moya" %}
{% assign title="Membership Officer" %}
{% assign linkedin="elijah-moya" %}
Expand All @@ -140,7 +140,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Technical Officer -->
{% assign image="nicolas-ruiz.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Nicolas Ruiz" %}
{% assign title="Technical Officer" %}
{% assign linkedin="nicolas-s-ruiz" %}
Expand All @@ -150,7 +150,7 @@ <h2>ACM Team</h2>
{% include officer.html %}

<!-- Social Officer -->
{% assign image="brendan-luu.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Brendan Luu" %}
{% assign title="Social Officer" %}
{% assign linkedin="brendanvluu" %}
Expand Down
10 changes: 5 additions & 5 deletions _includes/team_acmw.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h2>ACM-W Team</h2>
<div class="row" data-aos="fade-up">
<div class="row boxes d-flex justify-content-center">
<!-- President -->
{% assign image="joshua-lazaro.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Joshua Lazaro" %}
{% assign title="President" %}
{% assign linkedin="joshua-lazaro-3096ba196" %}
Expand All @@ -15,7 +15,7 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Vice President -->
{% assign image="izzy-montemayor.png" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Isabella Montemayor" %}
{% assign title="Vice President" %}
{% assign linkedin="" %}
Expand All @@ -25,7 +25,7 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Secretary -->
{% assign image="natalie-mosqueda.jpeg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Natalie Mosqueda" %}
{% assign title="Secretary" %}
{% assign linkedin="nataliemosqueda" %}
Expand All @@ -35,7 +35,7 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Public Relations -->
{% assign image="adriana-pulgar.jpg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Adriana Pulgar" %}
{% assign title="Public Relations" %}
{% assign linkedin="" %}
Expand All @@ -45,7 +45,7 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Social Media -->
{% assign image="elizabeth-barrera.jpeg" %}
{% assign image="jenelle-millison.png" %}
{% assign name="Elizabeth Barrera" %}
{% assign title="Social Media" %}
{% assign linkedin="" %}
Expand Down
Loading

0 comments on commit 64ea3a1

Please sign in to comment.