Skip to content

Commit

Permalink
Merge pull request #26 from acmutsa/update/team24
Browse files Browse the repository at this point in the history
Updating /team to 24-25 team + pictures
  • Loading branch information
jacobellerbrock authored Sep 26, 2024
2 parents e2b53a7 + c3eeb0a commit e530886
Show file tree
Hide file tree
Showing 97 changed files with 218 additions and 212 deletions.
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.8
5 changes: 4 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,15 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.5.3)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.14.4)
multipart-post (2.1.1)
nokogiri (1.11.3-arm64-darwin)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.3-x86_64-darwin)
racc (~> 1.4)
Expand Down Expand Up @@ -263,6 +265,7 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
ruby
universal-darwin-20
x86_64-darwin-19
x86_64-linux
Expand Down
10 changes: 7 additions & 3 deletions _includes/officer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

<div class="col-xl-3 col-lg-4 col-md-6 col-sm-6">
<div class="member">
<img src="{{ site.baseurl }}/assets/img/team/{{ image }}" class="img-fluid" style="aspect-ratio: 1 / 1 !important; object-fit: cover !important;" alt="{{ name }}'s profile picture">
<img src="{{ site.baseurl }}/assets/img/team/{{ image }}" class="img-fluid" style="
aspect-ratio: 1 / 1 !important;
object-fit: cover !important;
" alt="{{ name }}'s profile picture">
<div class="member-info">
<div class="member-info-content">
<h4>{{ name }}</h4>
Expand All @@ -13,8 +17,8 @@ <h4>{{ name }}</h4>
<a href="https://www.linkedin.com/in/{{ linkedin }}"><i class="iconify" data-icon="cib:linkedin" data-inline="false"></i></a>
{% endif %}

{% if twitter != "" %}
<a href="https://twitter.com/{{ twitter }}"><i class="iconify" data-icon="cib:twitter" data-inline="false"></i></a>
{% if github != "" %}
<a href="https://github.com/{{ github }}"><i class="iconify" data-icon="cib:github" data-inline="false"></i></a>
{% endif %}

{% if instagram != "" %}
Expand Down
138 changes: 59 additions & 79 deletions _includes/team_acm.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,91 +8,61 @@ <h2>ACM Team</h2>
ACM EXECUTIVE COUNCIL
-->
<!-- President -->
{% assign image="elijah-moya.jpg" %}
{% assign name="Elijah Moya" %}
{% assign image="kailey-perrino.jpg" %}
{% assign name="Kailey Perrino" %}
{% assign title="President" %}
{% assign linkedin="elijah-moya" %}
{% assign twitter="" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Vice President -->
{% assign image="alex-smith.jpg" %}
{% assign name="Alex Smith" %}
{% assign image="joshua-silva.jpeg" %}
{% assign name="Joshua Silva" %}
{% assign title="Vice President" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign linkedin="joshuasilva414" %}
{% assign github="joshuasilva414" %}
{% assign instagram="" %}
{% assign other="" %}
{% assign other="https://www.joshuasilva.me" %}
{% include officer.html %}

<!-- Secretary -->
{% assign image="katherine-hoog.png" %}
{% assign name="Katherine Hoog" %}
{% assign image="laura-barnes.png" %}
{% assign name="Laura Barnes" %}
{% assign title="Secretary" %}
{% assign linkedin="katherine-hoog" %}
{% assign twitter="" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Treasurer -->
{% assign image="christopher-placencio.jpg" %}
{% assign name="Christopher Placencio" %}
{% assign image="jada-velasquez.jpg" %}
{% assign name="Jada Velasquez" %}
{% assign title="Treasurer" %}
{% assign linkedin="christopher-placencio-83a88a1b7" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- RowdyHacks Director -->
{% assign image="adolfo-ayala.jpg" %}
{% assign name="Adolfo Ayala" %}
{% assign title="RowdyHacks Director" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- ACM-W Director -->
{% assign image="rachel-easton.png" %}
{% assign name="Rachel Easton" %}
{% assign title="ACM-W Director" %}
{% assign linkedin="rachel-easton-0b592321a" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Rowdy Creators Director -->
{% assign image="analisa-rojas.jpg" %}
{% assign name="Analisa Rojas" %}
{% assign title="Rowdy Creators Director" %}
{% assign linkedin="analisa-rojas-0272a0a8" %}
{% assign twitter="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- ICPC Director -->
{% assign image="markus-bao.jpg" %}
{% assign name="Markus Bao" %}
{% assign image="jonathan-de koning.jpg" %}
{% assign name="Jonathan de Koning" %}
{% assign title="ICPC Director" %}
{% assign linkedin="markus-bao-69a91a212" %}
{% assign twitter="" %}
{% assign linkedin="jonathandekoning" %}
{% assign github="JonathanJdeKoning" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- CIC Director -->
{% assign image="kris-holmes.jpg" %}
{% assign name="Kris Holmes" %}
{% assign title="Coding in Color Director" %}
{% assign linkedin="krisholmess" %}
{% assign twitter="" %}
<!-- Rowdy Datathon Co-Director -->
{% assign image="natasha-blussick.jpeg" %}
{% assign name="Natasha Blussick" %}
{% assign title="Rowdy Datathon Co-Director" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}
Expand All @@ -101,61 +71,71 @@ <h2>ACM Team</h2>
ACM COUNCIL
-->
<!-- Public Relations Officer -->
{% assign image="diem-bui.jpg" %}
{% assign name="Diem Bui" %}
{% assign image="kelinda-shen.jpg" %}
{% assign name="Kelinda Shen" %}
{% assign title="Public Relations Officer" %}
{% assign linkedin="diem-b-97a2951b5" %}
{% assign twitter="" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Media Officer -->
{% assign image="placeholder.png" %}
{% assign name="Bernardo Vazquez de la Cruz" %}
{% assign image="daniel-ruiz.jpeg" %}
{% assign name="Daniel Ruiz" %}
{% assign title="Media Officer" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Projects Officer -->
{% assign image="ryan-walters.jpg" %}
{% assign name="Ryan Walters" %}
{% assign image="christian-walker.jpg" %}
{% assign name="Christian Walker" %}
{% assign title="Projects Officer" %}
{% assign linkedin="ryancwalters" %}
{% assign twitter="" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Membership Officer -->
{% assign image="parker-leathers.jpg" %}
{% assign name="Parker Leathers" %}
{% assign image="paolo-lay.png" %}
{% assign name="Paolo Lay" %}
{% assign title="Membership Officer" %}
{% assign linkedin="parker-leathers" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign linkedin="paolo-lay" %}
{% assign github="" %}
{% assign instagram="paololayy" %}
{% assign other="" %}
{% include officer.html %}

<!-- Technical Officer -->
{% assign image="liam-murray.png" %}
{% assign name="Liam Murray" %}
{% assign image="jacob-ellerbrock.png" %}
{% assign name="Jacob Ellerbrock" %}
{% assign title="Technical Officer" %}
{% assign linkedin="liamrmurray" %}
{% assign twitter="" %}
{% assign linkedin="jacobellerbrock" %}
{% assign github="jacobellerbrock" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Social Officer -->
{% assign image="mei-sullum2.png" %}
{% assign name="Mei Sullum" %}
{% assign image="alex-mugica.jpg" %}
{% assign name="Alex Mugica" %}
{% assign title="Social Officer" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Bits & Bytes Program Manager -->
{% assign image="alessandro-espinosa.jpeg" %}
{% assign name="Alessandro Espinosa" %}
{% assign title="Bits & Bytes Program Manager" %}
{% assign linkedin="" %}
{% assign github="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}
Expand Down
30 changes: 15 additions & 15 deletions _includes/team_acmw.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ <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 name="Joshua Lazaro" %}
{% assign title="President" %}
{% assign linkedin="joshua-lazaro-3096ba196" %}
<!-- ACM-W Director -->
{% assign image="vivian-tran.png" %}
{% assign name="Vivian Tran" %}
{% assign title="ACM-W Director" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="https://devpost.com/lazaro-josh1234?ref_content=user-portfolio&ref_feature=portfolio&ref_medium=global-nav" %}
{% assign other="" %}
{% include officer.html %}

<!-- Vice President -->
{% assign image="izzy-montemayor.png" %}
{% assign name="Isabella Montemayor" %}
{% assign image="reese-sylvester.jpeg" %}
{% assign name="Reese Sylvester" %}
{% assign title="Vice President" %}
{% assign linkedin="" %}
{% assign twitter="" %}
Expand All @@ -25,18 +25,18 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Secretary -->
{% assign image="natalie-mosqueda.jpeg" %}
{% assign name="Natalie Mosqueda" %}
{% assign image="brooke lane.jpeg" %}
{% assign name="Brooke Lane" %}
{% assign title="Secretary" %}
{% assign linkedin="nataliemosqueda" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="" %}
{% include officer.html %}

<!-- Public Relations -->
{% assign image="adriana-pulgar.jpg" %}
{% assign name="Adriana Pulgar" %}
{% assign image="brianna-anaya carrasco.jpeg" %}
{% assign name="Brainna Anaya Carrasco" %}
{% assign title="Public Relations" %}
{% assign linkedin="" %}
{% assign twitter="" %}
Expand All @@ -45,8 +45,8 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Social Media -->
{% assign image="elizabeth-barrera.jpeg" %}
{% assign name="Elizabeth Barrera" %}
{% assign image="cassandra-gomez.jpg" %}
{% assign name="Cassandra Gomez" %}
{% assign title="Social Media" %}
{% assign linkedin="" %}
{% assign twitter="" %}
Expand Down
Loading

0 comments on commit e530886

Please sign in to comment.