Skip to content

Commit 64ea3a1

Browse files
ZaqttackZaqttack
authored
Merge pull request #23 from UTSA-ACM/feature/april-fools-2022
Alaskan Coastal Mammals [URGENT UPDATE]
2 parents 84cb89e + 54908c2 commit 64ea3a1

File tree

26 files changed

+401
-307
lines changed

26 files changed

+401
-307
lines changed

‎_includes/about_section.html‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,26 @@ <h2>About ACM</h2>
77

88
<div class="row">
99
<div class="col-xl-6 col-lg-7" data-aos="fade-right">
10-
<img src="assets/img/about-img.jpg" class="img-fluid" alt="">
10+
<img src="assets/img/otter-about.jpg" class="img-fluid" alt="">
1111
</div>
1212
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
1313
<p id="about-statement" data-aos="fade-up">
14-
The Association for Computing Machinery at UTSA is dedicated to giving members and students the
15-
opportunity to gain experience, network, socialize, learn, and grow outside of the classroom in
16-
all fields of technology and computing.
14+
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.
1715
</p>
1816
<div class="icon-box" data-aos="fade-up">
1917
<i class='bx bx-info-circle bx-tada'></i>
20-
<h4>Organization</h4>
21-
<p>Our chapter is organized to serve students for academic, professional, and social purposes at
22-
UTSA. The Chapter shall be involved with and conduct activities that are included below.</p>
18+
<h4>Why?</h4>
19+
<p>Because our President loves otters.</p>
20+
</div>
21+
<div class="icon-box" data-aos="fade-up">
22+
<i class='bx bx-info-circle bx-tada'></i>
23+
<h4>Where?</h4>
24+
<p>Located on UTSA Campus.</p>
25+
</div>
26+
<div class="icon-box" data-aos="fade-up">
27+
<i class='bx bx-info-circle bx-tada'></i>
28+
<h4>When?</h4>
29+
<p>Yearly.</p>
2330
</div>
2431
</div>
2532
</div>
@@ -30,36 +37,40 @@ <h4>Organization</h4>
3037
<section id="steps" class="steps section-bg">
3138
<div class="container">
3239

40+
<div class="section-title" data-aos="fade-up">
41+
<h2>Otter Facts</h2>
42+
</div>
43+
3344
<div class="row no-gutters">
3445

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

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

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

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

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

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

6576
</div>

‎_includes/footer.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ <h4>Useful Links</h4>
2323
<ul>
2424
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}/">Home</a></li>
2525
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link sponsorship.html %}">Sponsorship</a></li>
26+
<li><i class="bx bx-chevron-right"></i><a href="https://video.ibm.com/seaotters">Watch</a></li>
2627
</ul>
2728
</div>
2829

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

4142
<div class="col-lg-2 col-md-2 footer-links d-none d-md-block">
4243
<h4>Resources</h4>

‎_includes/head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>ACM UTSA</title>
88

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

1313
<!-- Stylesheets -->

‎_includes/navbar.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- text logo top left corner-->
66
<!-- <h1 class="text-light"><a href="index.html">ACM UTSA</a></h1> -->
77
<!-- image logo top left corner-->
8-
<a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/assets/img/logos/logo.png" alt="ACM Logo" class="img-fluid"></a>
8+
<a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/assets/img/otter-jenelle.png" alt="ACM Logo" class="img-fluid"></a>
99
</div>
1010

1111
{% if page.title=="home" %}
@@ -30,7 +30,8 @@
3030
<li class="{{ home }}"><a href="{{ site.baseurl }}/">Home</a></li>
3131
<li class="{{ team }}"><a href="{{ site.baseurl }}{% link team.html %}">Team</a></li>
3232
<li class="{{ calendar }}"><a href="{{ site.baseurl }}{% link calendar.html %}">Calendar</a></li>
33-
<li class="drop-down {{ suborg }}"><a href="">Sub Orgs</a>
33+
<li class="{{ calendar }}"><a href="https://video.ibm.com/seaotters">Watch</a></li>
34+
<!-- <li class="drop-down {{ suborg }}"><a href="">Sub Orgs</a>
3435
<ul>
3536
<li><a href="{{ site.baseurl }}{% link suborg_acmw.html %}">ACM-W</a></li>
3637
<li><a href="{{ site.baseurl }}{% link suborg_icpc.html %}">ACM ICPC</a></li>
@@ -39,9 +40,9 @@
3940
<li><a href="{{ site.baseurl }}{% link suborg_rowdyhacks.html %}">RowdyHacks</a></li>
4041
<li><a href="{{ site.baseurl }}{% link suborg_code_quantum.html %}">Code Quantum</a></li>
4142
</ul>
42-
</li>
43+
</li> -->
4344
<li class="{{ sponsorship }}"><a href="{{ site.baseurl }}{% link sponsorship.html %}">Sponsorship</a></li>
44-
<li class="{{ donate }}"><a href="{{ site.baseurl }}{% link donate.html %}">Donate</a></li>
45+
<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>
4546
<li class="drop-down {{ resource }}"><a href="">Resources</a>
4647
<ul>
4748
<li><a href="{{ site.baseurl }}{% link member_new.html %}">Register</a></li>

‎_includes/suborg_section.html‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,24 @@
22
<div class="container">
33

44
<div class="section-title" data-aos="fade-up">
5-
<h2>Our Sub Organizations</h2>
5+
<h2 style="margin-bottom: 0px;">An Otter Essay</h2>
6+
<h3 style="font-size: 24px; line-height: 26px;">By Mei Sullum</h3>
67
</div>
7-
8+
89
<div class="row">
10+
<div class="col-xl-12 col-lg-12 col-md-12 mb-5 mb-lg-0">
11+
<p data-aos="fade-up">
12+
Otters live on all continents except Australia and Antarctica. They can live on land and in the water.
13+
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.
14+
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.
15+
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.
16+
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.
17+
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
18+
</p>
19+
</div>
20+
</div>
21+
22+
<!-- <div class="row">
923
<div class="col-lg-4 mb-5 mb-lg-0">
1024
<ul class="nav nav-tabs flex-column">
1125
<li class="nav-item" data-aos="fade-right">
@@ -86,6 +100,6 @@ <h2 class="inline-name">Code Quantum</h2>
86100
</div>
87101
</div>
88102
</div>
89-
</div>
103+
</div> -->
90104
</div>
91105
</section>

‎_includes/team_acm.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2>ACM Team</h2>
1818
{% include officer.html %}
1919

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

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

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

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

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

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

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

9090
<!-- Bits & Bytes Director -->
91-
{% assign image="finn-bm.jpg" %}
91+
{% assign image="jenelle-millison.png" %}
9292
{% assign name="Finn Burmeister-Morton" %}
9393
{% assign title="Bits & Bytes Director" %}
9494
{% assign linkedin="finn-burmeister-morton-2b9b5217a" %}
@@ -101,7 +101,7 @@ <h2>ACM Team</h2>
101101
ACM COUNCIL
102102
-->
103103
<!-- Public Relations Officer -->
104-
{% assign image="default-pfp.png" %}
104+
{% assign image="jenelle-millison.png" %}
105105
{% assign name="Mei Sullum" %}
106106
{% assign title="Public Relations Officer" %}
107107
{% assign twitter="" %}
@@ -110,7 +110,7 @@ <h2>ACM Team</h2>
110110
{% include officer.html %}
111111

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

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

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

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

152152
<!-- Social Officer -->
153-
{% assign image="brendan-luu.png" %}
153+
{% assign image="jenelle-millison.png" %}
154154
{% assign name="Brendan Luu" %}
155155
{% assign title="Social Officer" %}
156156
{% assign linkedin="brendanvluu" %}

‎_includes/team_acmw.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2>ACM-W Team</h2>
55
<div class="row" data-aos="fade-up">
66
<div class="row boxes d-flex justify-content-center">
77
<!-- President -->
8-
{% assign image="joshua-lazaro.png" %}
8+
{% assign image="jenelle-millison.png" %}
99
{% assign name="Joshua Lazaro" %}
1010
{% assign title="President" %}
1111
{% assign linkedin="joshua-lazaro-3096ba196" %}
@@ -15,7 +15,7 @@ <h2>ACM-W Team</h2>
1515
{% include officer.html %}
1616

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

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

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

4747
<!-- Social Media -->
48-
{% assign image="elizabeth-barrera.jpeg" %}
48+
{% assign image="jenelle-millison.png" %}
4949
{% assign name="Elizabeth Barrera" %}
5050
{% assign title="Social Media" %}
5151
{% assign linkedin="" %}

0 commit comments

Comments
 (0)