Skip to content

Feature/updating front page #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2022
Merged

Feature/updating front page #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b11341
stylized suborg section on front page
Zaqttack Feb 18, 2022
a9bd18a
Updated Team Page
Zaqttack Feb 18, 2022
e2fe0da
changed fade
Zaqttack Feb 18, 2022
ccf69a3
changed carousel settings
Zaqttack Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/rowdyhacks_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Every year, a committee of members get together to help plan and organize th
<div class="container">
<div class="row">
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-right">
<img src="{{ site.baseurl }}/assets/img/logos/rowdyhacks_21_logo.png" class="img-fluid" alt="">
<img src="{{ site.baseurl }}/assets/img/logos/rh-logo.png" class="img-fluid" alt="">
</div>

<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
Expand Down
77 changes: 47 additions & 30 deletions _includes/suborg_section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,82 @@ <h2>Our Sub Organizations</h2>
</div>

<div class="row">
<div class="col-lg-4 mb-5 mb-lg-0" data-aos="fade-right">
<div class="col-lg-4 mb-5 mb-lg-0">
<ul class="nav nav-tabs flex-column">
<li class="nav-item">
<li class="nav-item" data-aos="fade-right">
<a class="nav-link active show" data-toggle="tab" href="#tab-1">
<h4>ACM-W</h4>
<p>Minority centric chapter focusing on creating an academic and professional
community</p>
<img src="assets/img/logos/480_acm_w_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h3 class="inline-name">ACM-W</h3>
<p class="hidden-on-desktop">Minority centric chapter focusing on creating an academic and professional community</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-2">
<h4>ICPC</h4>
<p>Competitive programming for students looking to expand their coding skills</p>
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">ICPC</h2>
<p class="hidden-on-desktop">Competitive programming for students looking to expand their coding skills</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-3">
<h4>RowdyHacks</h4>
<p>ACM's 24-hour hackathon competition with hundreds of students, sponsors, and
prizes</p>
<img src="assets/img/logos/480_rowdy_creators_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Rowdy Creators</h2>
<p class="hidden-on-desktop">ACM’s multi-discipline incubator specializing in helping students learn and contribute to long-term technology projects</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-4">
<h4>Rowdy Creators</h4>
<p>ACM’s multi-discipline incubator specializing in helping students learn and
contribute to long-term technology projects</p>
<img src="assets/img/logos/bnb-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Bits & Bytes</h2>
<p class="hidden-on-desktop">This is ACM UTSA's mentorship program where we help peers in CS succeed</p>
</a>
</li>
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-5">
<img src="assets/img/logos/rh-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">RowdyHacks</h2>
<p class="hidden-on-desktop">ACM UTSA's 24-hour hackathon competition with hundreds of students, sponsors, and prizes</p>
</a>
</li>
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-6">
<img src="assets/img/logos/cq-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Code Quantum</h2>
<p class="hidden-on-desktop">ACM UTSA's first annual hackathon for underrepresented genders</p>
</a>
</li>
</ul>
</div>
<div class="col-lg-7 ml-auto d-none d-lg-block" data-aos="fade-left">
<div class="tab-content center-in-container">
<div class="col-lg-7 ml-auto center-in-container hidden-on-mobile" data-aos="fade-left">
<div class="tab-content">
<div class="tab-pane active show" id="tab-1">
<figure>
<a href="{{ site.baseurl }}{% link suborg_acmw.html %}">
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
</a>
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-2">
<figure>
<a href="{{ site.baseurl }}{% link suborg_icpc.html %}">
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
</a>
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-3">
<figure>
<a href="{{ site.baseurl }}{% link suborg_rowdyhacks.html %}">
<img src="assets/img/logos/480_rowdyhacks21.png" alt="rowdyhacks logo" class="img-fluid">
</a>
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-4">
<figure>
<a href="{{ site.baseurl }}{% link suborg_rowdy_creators.html %}">
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
</a>
<img src="assets/img/logos/bnb-logo.png" alt="rowdy creators logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-5">
<figure>
<img src="assets/img/logos/rh-logo.png" alt="rowdyhacks logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-6">
<figure>
<img src="assets/img/logos/cq-logo.png" alt="rowdyhacks logo" class="img-fluid">
</figure>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/team_acm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ <h2>ACM Team</h2>
ACM COUNCIL
-->
<!-- Public Relations Officer -->
{% assign image="512_Trey_DAmico.jpg" %}
{% assign name="Trey d'Amico" %}
{% assign image="default-pfp.png" %}
{% assign name="Mei Sullum" %}
{% assign title="Public Relations Officer" %}
{% assign twitter="" %}
{% assign instagram="" %}
Expand Down
6 changes: 3 additions & 3 deletions _includes/team_acmw.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ <h2>ACM-W Team</h2>
{% include officer.html %}

<!-- Public Relations -->
{% assign image="mira-espiritu.jpeg" %}
{% assign name="Mira Espiritu" %}
{% assign image="default-pfp.png" %}
{% assign name="Adriana Pulgar" %}
{% assign title="Public Relations" %}
{% assign linkedin="mira-espiritu-074a45210" %}
{% assign linkedin="" %}
{% assign twitter="" %}
{% assign instagram="" %}
{% assign other="" %}
Expand Down
4 changes: 2 additions & 2 deletions _includes/team_faculty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ <h2>Faculty Sponsors</h2>
<div class="row" data-aos="fade-up">
<div class="row boxes d-flex justify-content-center">
{% assign councilLevel="faculty" %}
{% assign image="512-mark-robinson.jpg" %}
{% assign name="Mark Robinson" %}
{% assign image="kevin-desai.jpg" %}
{% assign name="Kevin Desai" %}
{% assign title="ACM Faculty Sponsor" %}
{% assign linkedin="" %}
{% assign twitter="" %}
Expand Down
8 changes: 8 additions & 0 deletions _site/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,10 @@ img { pointer-events: none; }

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

h3 { display: unset; }

@media (max-width: 992px) { .hidden-on-mobile { display: none; } }
@media (min-width: 992px) { .hidden-on-desktop { display: none; } }
/* ---------------------------------- Buttons
----------------------------------- */
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; }
Expand Down Expand Up @@ -2448,6 +2451,8 @@ section { padding: 60px 0; overflow: hidden; }

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

.inline-name { display: inline; }

@media (min-width: 1024px) { #hero { background-attachment: fixed; } }
@media (max-width: 992px) { #hero { margin-top: 60px; height: calc(100vh - 60px); } }
@media (max-width: 768px) { #hero h1 { font-size: 28px; line-height: 36px; }
Expand Down Expand Up @@ -2508,6 +2513,7 @@ section { padding: 60px 0; overflow: hidden; }
@keyframes slide-down { 0% { opacity: 0; }
100% { opacity: 1; } }
@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; } }
@media (max-width: 992px) { .inline-logo { display: inline; margin-bottom: 0.5rem; margin-right: 0.5rem; } }
/*--------------------------------------------------------------
# Services
--------------------------------------------------------------*/
Expand Down Expand Up @@ -2680,6 +2686,8 @@ section { padding: 60px 0; overflow: hidden; }

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

.slick-slide { padding: 0 25px 0 25px; }

@media (max-width: 992px) { #sponsorship { height: 100%; }
#sponsorship img { width: 345px; }
#sponsorship .image-container { height: 245px; } }
Expand Down
77 changes: 47 additions & 30 deletions _site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,65 +172,82 @@ <h2>Our Sub Organizations</h2>
</div>

<div class="row">
<div class="col-lg-4 mb-5 mb-lg-0" data-aos="fade-right">
<div class="col-lg-4 mb-5 mb-lg-0">
<ul class="nav nav-tabs flex-column">
<li class="nav-item">
<li class="nav-item" data-aos="fade-right">
<a class="nav-link active show" data-toggle="tab" href="#tab-1">
<h4>ACM-W</h4>
<p>Minority centric chapter focusing on creating an academic and professional
community</p>
<img src="assets/img/logos/480_acm_w_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h3 class="inline-name">ACM-W</h3>
<p class="hidden-on-desktop">Minority centric chapter focusing on creating an academic and professional community</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-2">
<h4>ICPC</h4>
<p>Competitive programming for students looking to expand their coding skills</p>
<img src="/assets/img/logos/icpc-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">ICPC</h2>
<p class="hidden-on-desktop">Competitive programming for students looking to expand their coding skills</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-3">
<h4>RowdyHacks</h4>
<p>ACM's 24-hour hackathon competition with hundreds of students, sponsors, and
prizes</p>
<img src="assets/img/logos/480_rowdy_creators_logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Rowdy Creators</h2>
<p class="hidden-on-desktop">ACM’s multi-discipline incubator specializing in helping students learn and contribute to long-term technology projects</p>
</a>
</li>
<li class="nav-item mt-2">
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-4">
<h4>Rowdy Creators</h4>
<p>ACM’s multi-discipline incubator specializing in helping students learn and
contribute to long-term technology projects</p>
<img src="assets/img/logos/bnb-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Bits & Bytes</h2>
<p class="hidden-on-desktop">This is ACM UTSA's mentorship program where we help peers in CS succeed</p>
</a>
</li>
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-5">
<img src="assets/img/logos/rh-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">RowdyHacks</h2>
<p class="hidden-on-desktop">ACM UTSA's 24-hour hackathon competition with hundreds of students, sponsors, and prizes</p>
</a>
</li>
<li class="nav-item mt-2" data-aos="fade-right">
<a class="nav-link" data-toggle="tab" href="#tab-6">
<img src="assets/img/logos/cq-logo.png" width="32" height="32" class="inline-logo hidden-on-desktop" alt="acmw logo"/>
<h2 class="inline-name">Code Quantum</h2>
<p class="hidden-on-desktop">ACM UTSA's first annual hackathon for underrepresented genders</p>
</a>
</li>
</ul>
</div>
<div class="col-lg-7 ml-auto d-none d-lg-block" data-aos="fade-left">
<div class="tab-content center-in-container">
<div class="col-lg-7 ml-auto center-in-container hidden-on-mobile" data-aos="fade-left">
<div class="tab-content">
<div class="tab-pane active show" id="tab-1">
<figure>
<a href="/suborg_acmw/">
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
</a>
<img src="assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-2">
<figure>
<a href="/suborg_icpc/">
<img src="/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
</a>
<img src="/assets/img/logos/icpc-logo.png" alt="icpc logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-3">
<figure>
<a href="/suborg_rowdyhacks/">
<img src="assets/img/logos/480_rowdyhacks21.png" alt="rowdyhacks logo" class="img-fluid">
</a>
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-4">
<figure>
<a href="/suborg_rowdy_creators/">
<img src="assets/img/logos/480_rowdy_creators_logo.png" alt="rowdy creators logo" class="img-fluid">
</a>
<img src="assets/img/logos/bnb-logo.png" alt="rowdy creators logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-5">
<figure>
<img src="assets/img/logos/rh-logo.png" alt="rowdyhacks logo" class="img-fluid">
</figure>
</div>
<div class="tab-pane" id="tab-6">
<figure>
<img src="assets/img/logos/cq-logo.png" alt="rowdyhacks logo" class="img-fluid">
</figure>
</div>
</div>
Expand Down
Loading