Skip to content

Commit ef4affb

Browse files
ZaqttackZaqttack
authored
Merge pull request #19 from UTSA-ACM/feature/updating_front_page
Feature/updating front page
2 parents e16d680 + ccf69a3 commit ef4affb

19 files changed

+185
-98
lines changed

‎_includes/rowdyhacks_content.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h2>Every year, a committee of members get together to help plan and organize th
1717
<div class="container">
1818
<div class="row">
1919
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-right">
20-
<img src="{{ site.baseurl }}/assets/img/logos/rowdyhacks_21_logo.png" class="img-fluid" alt="">
20+
<img src="{{ site.baseurl }}/assets/img/logos/rh-logo.png" class="img-fluid" alt="">
2121
</div>
2222

2323
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">

‎_includes/suborg_section.html‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,82 @@ <h2>Our Sub Organizations</h2>
66
</div>
77

88
<div class="row">
9-
<div class="col-lg-4 mb-5 mb-lg-0" data-aos="fade-right">
9+
<div class="col-lg-4 mb-5 mb-lg-0">
1010
<ul class="nav nav-tabs flex-column">
11-
<li class="nav-item">
11+
<li class="nav-item" data-aos="fade-right">
1212
<a class="nav-link active show" data-toggle="tab" href="#tab-1">
13-
<h4>ACM-W</h4>
14-
<p>Minority centric chapter focusing on creating an academic and professional
15-
community</p>
13+
<img src="assets/img/logos/480_acm_w_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
14+
<h3 class="inline-name">ACM-W</h3>
15+
<p class="hidden-on-desktop">Minority centric chapter focusing on creating an academic and professional community</p>
1616
</a>
1717
</li>
18-
<li class="nav-item mt-2">
18+
<li class="nav-item mt-2" data-aos="fade-right">
1919
<a class="nav-link" data-toggle="tab" href="#tab-2">
20-
<h4>ICPC</h4>
21-
<p>Competitive programming for students looking to expand their coding skills</p>
20+
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
21+
<h2 class="inline-name">ICPC</h2>
22+
<p class="hidden-on-desktop">Competitive programming for students looking to expand their coding skills</p>
2223
</a>
2324
</li>
24-
<li class="nav-item mt-2">
25+
<li class="nav-item mt-2" data-aos="fade-right">
2526
<a class="nav-link" data-toggle="tab" href="#tab-3">
26-
<h4>RowdyHacks</h4>
27-
<p>ACM's 24-hour hackathon competition with hundreds of students, sponsors, and
28-
prizes</p>
27+
<img src="assets/img/logos/480_rowdy_creators_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
28+
<h2 class="inline-name">Rowdy Creators</h2>
29+
<p class="hidden-on-desktop">ACM’s multi-discipline incubator specializing in helping students learn and contribute to long-term technology projects</p>
2930
</a>
3031
</li>
31-
<li class="nav-item mt-2">
32+
<li class="nav-item mt-2" data-aos="fade-right">
3233
<a class="nav-link" data-toggle="tab" href="#tab-4">
33-
<h4>Rowdy Creators</h4>
34-
<p>ACM’s multi-discipline incubator specializing in helping students learn and
35-
contribute to long-term technology projects</p>
34+
<img src="assets/img/logos/bnb-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
35+
<h2 class="inline-name">Bits & Bytes</h2>
36+
<p class="hidden-on-desktop">This is ACM UTSA's mentorship program where we help peers in CS succeed</p>
37+
</a>
38+
</li>
39+
<li class="nav-item mt-2" data-aos="fade-right">
40+
<a class="nav-link" data-toggle="tab" href="#tab-5">
41+
<img src="assets/img/logos/rh-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
42+
<h2 class="inline-name">RowdyHacks</h2>
43+
<p class="hidden-on-desktop">ACM UTSA's 24-hour hackathon competition with hundreds of students, sponsors, and prizes</p>
44+
</a>
45+
</li>
46+
<li class="nav-item mt-2" data-aos="fade-right">
47+
<a class="nav-link" data-toggle="tab" href="#tab-6">
48+
<img src="assets/img/logos/cq-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
49+
<h2 class="inline-name">Code Quantum</h2>
50+
<p class="hidden-on-desktop">ACM UTSA's first annual hackathon for underrepresented genders</p>
3651
</a>
3752
</li>
3853
</ul>
3954
</div>
40-
<div class="col-lg-7 ml-auto d-none d-lg-block" data-aos="fade-left">
41-
<div class="tab-content center-in-container">
55+
<div class="col-lg-7 ml-auto center-in-container hidden-on-mobile" data-aos="fade-left">
56+
<div class="tab-content">
4257
<div class="tab-pane active show" id="tab-1">
4358
<figure>
44-
<a href="{{ site.baseurl }}{% link suborg_acmw.html %}">
45-
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
46-
</a>
59+
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
4760
</figure>
4861
</div>
4962
<div class="tab-pane" id="tab-2">
5063
<figure>
51-
<a href="{{ site.baseurl }}{% link suborg_icpc.html %}">
52-
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
53-
</a>
64+
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
5465
</figure>
5566
</div>
5667
<div class="tab-pane" id="tab-3">
5768
<figure>
58-
<a href="{{ site.baseurl }}{% link suborg_rowdyhacks.html %}">
59-
<img src="assets/img/logos/480_rowdyhacks21.png" alt="rowdyhacks logo" class="img-fluid">
60-
</a>
69+
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
6170
</figure>
6271
</div>
6372
<div class="tab-pane" id="tab-4">
6473
<figure>
65-
<a href="{{ site.baseurl }}{% link suborg_rowdy_creators.html %}">
66-
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
67-
</a>
74+
<img src="assets/img/logos/bnb-logo.png" alt="rowdy creators logo" class="img-fluid">
75+
</figure>
76+
</div>
77+
<div class="tab-pane" id="tab-5">
78+
<figure>
79+
<img src="assets/img/logos/rh-logo.png" alt="rowdyhacks logo" class="img-fluid">
80+
</figure>
81+
</div>
82+
<div class="tab-pane" id="tab-6">
83+
<figure>
84+
<img src="assets/img/logos/cq-logo.png" alt="rowdyhacks logo" class="img-fluid">
6885
</figure>
6986
</div>
7087
</div>

‎_includes/team_acm.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ <h2>ACM Team</h2>
101101
ACM COUNCIL
102102
-->
103103
<!-- Public Relations Officer -->
104-
{% assign image="512_Trey_DAmico.jpg" %}
105-
{% assign name="Trey d'Amico" %}
104+
{% assign image="default-pfp.png" %}
105+
{% assign name="Mei Sullum" %}
106106
{% assign title="Public Relations Officer" %}
107107
{% assign twitter="" %}
108108
{% assign instagram="" %}

‎_includes/team_acmw.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ <h2>ACM-W Team</h2>
3535
{% include officer.html %}
3636

3737
<!-- Public Relations -->
38-
{% assign image="mira-espiritu.jpeg" %}
39-
{% assign name="Mira Espiritu" %}
38+
{% assign image="default-pfp.png" %}
39+
{% assign name="Adriana Pulgar" %}
4040
{% assign title="Public Relations" %}
41-
{% assign linkedin="mira-espiritu-074a45210" %}
41+
{% assign linkedin="" %}
4242
{% assign twitter="" %}
4343
{% assign instagram="" %}
4444
{% assign other="" %}

‎_includes/team_faculty.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ <h2>Faculty Sponsors</h2>
55
<div class="row" data-aos="fade-up">
66
<div class="row boxes d-flex justify-content-center">
77
{% assign councilLevel="faculty" %}
8-
{% assign image="512-mark-robinson.jpg" %}
9-
{% assign name="Mark Robinson" %}
8+
{% assign image="kevin-desai.jpg" %}
9+
{% assign name="Kevin Desai" %}
1010
{% assign title="ACM Faculty Sponsor" %}
1111
{% assign linkedin="" %}
1212
{% assign twitter="" %}

‎_site/css/main.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,10 @@ img { pointer-events: none; }
23022302

23032303
.center-in-container { display: flex; justify-content: center; align-items: center; }
23042304

2305+
h3 { display: unset; }
2306+
23052307
@media (max-width: 992px) { .hidden-on-mobile { display: none; } }
2308+
@media (min-width: 992px) { .hidden-on-desktop { display: none; } }
23062309
/* ---------------------------------- Buttons
23072310
----------------------------------- */
23082311
button { cursor: pointer; border-width: 1px; border-radius: 5px; font-size: 22px; font-weight: 500; -webkit-box-shadow: 0 10px 20px -6px rgba(0, 0, 0, 0.12); -moz-box-shadow: 0 10px 20px -6px rgba(0, 0, 0, 0.12); box-shadow: 0 10px 20px -6px rgba(0, 0, 0, 0.12); overflow: hidden; position: relative; -moz-transition: all .3s ease; -o-transition: all .3s ease; -webkit-transition: all .3s ease; -ms-transition: all .3s ease; transition: all .3s ease; margin-bottom: 25px; }
@@ -2448,6 +2451,8 @@ section { padding: 60px 0; overflow: hidden; }
24482451

24492452
#hero .btn-get-started:hover { background: #f15a22; }
24502453

2454+
.inline-name { display: inline; }
2455+
24512456
@media (min-width: 1024px) { #hero { background-attachment: fixed; } }
24522457
@media (max-width: 992px) { #hero { margin-top: 60px; height: calc(100vh - 60px); } }
24532458
@media (max-width: 768px) { #hero h1 { font-size: 28px; line-height: 36px; }
@@ -2508,6 +2513,7 @@ section { padding: 60px 0; overflow: hidden; }
25082513
@keyframes slide-down { 0% { opacity: 0; }
25092514
100% { opacity: 1; } }
25102515
@media (max-width: 768px) { .suborgs .nav-link.active, .suborgs .nav-link.active h4, .suborgs .tab-pane.active { box-shadow: 0 0 0; color: #0C2340; background-color: antiquewhite; } }
2516+
@media (max-width: 992px) { .inline-logo { display: inline; margin-bottom: 0.5rem; margin-right: 0.5rem; } }
25112517
/*--------------------------------------------------------------
25122518
# Services
25132519
--------------------------------------------------------------*/
@@ -2680,6 +2686,8 @@ section { padding: 60px 0; overflow: hidden; }
26802686

26812687
#sponsorship .image-container { height: 330px; }
26822688

2689+
.slick-slide { padding: 0 25px 0 25px; }
2690+
26832691
@media (max-width: 992px) { #sponsorship { height: 100%; }
26842692
#sponsorship img { width: 345px; }
26852693
#sponsorship .image-container { height: 245px; } }

‎_site/index.html‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -172,65 +172,82 @@ <h2>Our Sub Organizations</h2>
172172
</div>
173173

174174
<div class="row">
175-
<div class="col-lg-4 mb-5 mb-lg-0" data-aos="fade-right">
175+
<div class="col-lg-4 mb-5 mb-lg-0">
176176
<ul class="nav nav-tabs flex-column">
177-
<li class="nav-item">
177+
<li class="nav-item" data-aos="fade-right">
178178
<a class="nav-link active show" data-toggle="tab" href="#tab-1">
179-
<h4>ACM-W</h4>
180-
<p>Minority centric chapter focusing on creating an academic and professional
181-
community</p>
179+
<img src="assets/img/logos/480_acm_w_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
180+
<h3 class="inline-name">ACM-W</h3>
181+
<p class="hidden-on-desktop">Minority centric chapter focusing on creating an academic and professional community</p>
182182
</a>
183183
</li>
184-
<li class="nav-item mt-2">
184+
<li class="nav-item mt-2" data-aos="fade-right">
185185
<a class="nav-link" data-toggle="tab" href="#tab-2">
186-
<h4>ICPC</h4>
187-
<p>Competitive programming for students looking to expand their coding skills</p>
186+
<img src="/assets/img/logos/icpc-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
187+
<h2 class="inline-name">ICPC</h2>
188+
<p class="hidden-on-desktop">Competitive programming for students looking to expand their coding skills</p>
188189
</a>
189190
</li>
190-
<li class="nav-item mt-2">
191+
<li class="nav-item mt-2" data-aos="fade-right">
191192
<a class="nav-link" data-toggle="tab" href="#tab-3">
192-
<h4>RowdyHacks</h4>
193-
<p>ACM's 24-hour hackathon competition with hundreds of students, sponsors, and
194-
prizes</p>
193+
<img src="assets/img/logos/480_rowdy_creators_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
194+
<h2 class="inline-name">Rowdy Creators</h2>
195+
<p class="hidden-on-desktop">ACM’s multi-discipline incubator specializing in helping students learn and contribute to long-term technology projects</p>
195196
</a>
196197
</li>
197-
<li class="nav-item mt-2">
198+
<li class="nav-item mt-2" data-aos="fade-right">
198199
<a class="nav-link" data-toggle="tab" href="#tab-4">
199-
<h4>Rowdy Creators</h4>
200-
<p>ACM’s multi-discipline incubator specializing in helping students learn and
201-
contribute to long-term technology projects</p>
200+
<img src="assets/img/logos/bnb-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
201+
<h2 class="inline-name">Bits & Bytes</h2>
202+
<p class="hidden-on-desktop">This is ACM UTSA's mentorship program where we help peers in CS succeed</p>
203+
</a>
204+
</li>
205+
<li class="nav-item mt-2" data-aos="fade-right">
206+
<a class="nav-link" data-toggle="tab" href="#tab-5">
207+
<img src="assets/img/logos/rh-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
208+
<h2 class="inline-name">RowdyHacks</h2>
209+
<p class="hidden-on-desktop">ACM UTSA's 24-hour hackathon competition with hundreds of students, sponsors, and prizes</p>
210+
</a>
211+
</li>
212+
<li class="nav-item mt-2" data-aos="fade-right">
213+
<a class="nav-link" data-toggle="tab" href="#tab-6">
214+
<img src="assets/img/logos/cq-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
215+
<h2 class="inline-name">Code Quantum</h2>
216+
<p class="hidden-on-desktop">ACM UTSA's first annual hackathon for underrepresented genders</p>
202217
</a>
203218
</li>
204219
</ul>
205220
</div>
206-
<div class="col-lg-7 ml-auto d-none d-lg-block" data-aos="fade-left">
207-
<div class="tab-content center-in-container">
221+
<div class="col-lg-7 ml-auto center-in-container hidden-on-mobile" data-aos="fade-left">
222+
<div class="tab-content">
208223
<div class="tab-pane active show" id="tab-1">
209224
<figure>
210-
<a href="/suborg_acmw/">
211-
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
212-
</a>
225+
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
213226
</figure>
214227
</div>
215228
<div class="tab-pane" id="tab-2">
216229
<figure>
217-
<a href="/suborg_icpc/">
218-
<img src="/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
219-
</a>
230+
<img src="/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
220231
</figure>
221232
</div>
222233
<div class="tab-pane" id="tab-3">
223234
<figure>
224-
<a href="/suborg_rowdyhacks/">
225-
<img src="assets/img/logos/480_rowdyhacks21.png" alt="rowdyhacks logo" class="img-fluid">
226-
</a>
235+
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
227236
</figure>
228237
</div>
229238
<div class="tab-pane" id="tab-4">
230239
<figure>
231-
<a href="/suborg_rowdy_creators/">
232-
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
233-
</a>
240+
<img src="assets/img/logos/bnb-logo.png" alt="rowdy creators logo" class="img-fluid">
241+
</figure>
242+
</div>
243+
<div class="tab-pane" id="tab-5">
244+
<figure>
245+
<img src="assets/img/logos/rh-logo.png" alt="rowdyhacks logo" class="img-fluid">
246+
</figure>
247+
</div>
248+
<div class="tab-pane" id="tab-6">
249+
<figure>
250+
<img src="assets/img/logos/cq-logo.png" alt="rowdyhacks logo" class="img-fluid">
234251
</figure>
235252
</div>
236253
</div>

0 commit comments

Comments
 (0)