Skip to content

Commit e16d680

Browse files
ZaqttackZaqttack
authored
Merge pull request #18 from UTSA-ACM/feature/button-update
Feature/button update
2 parents da2e310 + 71a24d8 commit e16d680

15 files changed

+335
-170
lines changed

‎Gemfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ gem "minima", "~> 2.5"
1414

1515
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
1616
# uncomment the line below. To upgrade, run `bundle update github-pages`.
17-
gem "github-pages", group: :jekyll_plugins
17+
# gem "github-pages", group: :jekyll_plugins
1818
# If you have any plugins, put them here!
19-
# group :jekyll_plugins do
20-
# gem "jekyll-feed", "~> 0.12"
21-
# end
19+
group :jekyll_plugins do
20+
gem "jekyll-feed", "~> 0.12"
21+
end
2222

2323
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
2424
# and associated library.
@@ -30,5 +30,5 @@ end
3030
# Performance-booster for watching directories on Windows
3131
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
3232

33-
# gem "github-pages", "~> 214", group: :jekyll_plugins
33+
gem "github-pages", "~> 214", group: :jekyll_plugins
3434
gem "webrick", "~> 1.7"

‎_includes/acmw_content.html‎

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,50 @@ <h3 data-aos="fade-up">About Us</h3>
1212
</p><br>
1313
<div data-aos="fade-up">
1414
<h3>Join ACM-W!</h3>
15-
<form action="{{ site.baseurl }}{% link calendar.html %}">
16-
<button type="submit" class="btn-primary btn-block">
17-
<span>Events</span>
18-
<div class="icon d-flex align-items-center justify-content-center">
19-
<i class="bx bx-calendar-week"></i>
20-
</div>
21-
</button>
22-
</form>
23-
<form action="https://discord.acmutsa.org">
24-
<button type="submit" class="btn-primary btn-block">
25-
<span>Join Discord</span>
26-
<div class="icon d-flex align-items-center justify-content-center">
27-
<i class="bx bxl-discord"></i>
28-
</div>
29-
</button>
30-
</form>
31-
<form action="{{ site.baseurl }}{% link member_new.html %}">
32-
<button type="submit" class="btn-primary btn-block">
33-
<span>Membership</span>
34-
<div class="icon d-flex align-items-center justify-content-center">
35-
<i class="bx bx-user"></i>
36-
</div>
37-
</button>
38-
</form>
15+
<div class="sub-org-buttons">
16+
<div class="button_cont">
17+
<a class="main-button"
18+
href="{{ site.baseurl }}{% link calendar.html %}"
19+
rel="nofollow noopener noreferrer"
20+
draggable="false">
21+
<div class="icon-box">
22+
<i class="bx bx-calendar-week"></i>
23+
<h4>Events</h4>
24+
<p>Our meetings are listed on our calendar</p>
25+
</div>
26+
</a>
27+
</div>
28+
<div class="button_cont">
29+
<a class="main-button"
30+
href="https://discord.acmutsa.org"
31+
target="_blank"
32+
rel="nofollow noopener noreferrer"
33+
draggable="false">
34+
<div class="icon-box">
35+
<i class="bx bxl-discord"></i>
36+
<h4>Join</h4>
37+
<p>Our Discord</p>
38+
</div>
39+
</a>
40+
</div>
41+
<div class="button_cont">
42+
<a class="main-button"
43+
href="{{ site.baseurl }}{% link member_new.html %}"
44+
rel="nofollow noopener noreferrer"
45+
draggable="false">
46+
<div class="icon-box">
47+
<i class="bx bx-user"></i>
48+
<h4>Membership</h4>
49+
<p>Fill out this form and become a member!</p>
50+
</div>
51+
</a>
52+
</div>
53+
</div>
3954
</div>
4055
</div>
4156

42-
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-left">
43-
<img src="../assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid"></a>
57+
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-left">
58+
<img src="../assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
4459
</div>
4560
</div>
4661
</div>

‎_includes/icpc_content.html‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<section id="about" class="about section-bg-option-2">
22
<div class="container">
33
<div class="row">
4-
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-right">
4+
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-right">
55
<img src="{{ site.baseurl }}/assets/img/logos/icpc-logo.png" class="img-fluid" alt="icpc logo">
66
</div>
77
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
@@ -12,31 +12,46 @@ <h3 data-aos="fade-up">What is ICPC?</h3>
1212
varying difficulty, from easy to extremely hard.
1313
</p><br>
1414
<h3 data-aos="fade-up">Interested in Joining?</h3>
15-
<div data-aos="fade-up">
16-
<form action="mailto:[email protected]">
17-
<button type="submit" class="btn-primary btn-block">
18-
<span>Contact</span>
19-
<div class="icon d-flex align-items-center justify-content-center">
20-
<i class="bx bx-mail-send"></i>
21-
</div>
22-
</button>
23-
</form>
24-
<form action="https://discord.gg/qfckfeQ">
25-
<button type="submit" class="btn-primary btn-block">
26-
<span>Join Discord</span>
27-
<div class="icon d-flex align-items-center justify-content-center">
15+
16+
<div class="sub-org-buttons" data-aos="fade-up">
17+
<div class="button_cont">
18+
<a class="main-button"
19+
href="https://discord.gg/qfckfeQ"
20+
target="_blank"
21+
rel="nofollow noopener noreferrer"
22+
draggable="false">
23+
<div class="icon-box">
2824
<i class="bx bxl-discord"></i>
25+
<h4>Join</h4>
26+
<p>Our Discord</p>
2927
</div>
30-
</button>
31-
</form>
32-
<form action="{{ site.baseurl }}{% link member_new.html %}">
33-
<button type="submit" class="btn-primary btn-block">
34-
<span>Membership</span>
35-
<div class="icon d-flex align-items-center justify-content-center">
28+
</a>
29+
</div>
30+
<div class="button_cont">
31+
<a class="main-button"
32+
href="{{ site.baseurl }}{% link member_new.html %}"
33+
rel="nofollow noopener noreferrer"
34+
draggable="false">
35+
<div class="icon-box">
3636
<i class="bx bx-user"></i>
37+
<h4>Membership</h4>
38+
<p>Fill out this form and become a member!</p>
39+
</div>
40+
</a>
41+
</div>
42+
<div class="button_cont">
43+
<a class="main-button"
44+
href="mailto:[email protected]"
45+
target="_blank"
46+
rel="nofollow noopener noreferrer"
47+
draggable="false">
48+
<div class="icon-box">
49+
<i class="bx bx-mail-send"></i>
50+
<h4>Contact</h4>
51+
<p>The Director at [email protected]</p>
3752
</div>
38-
</button>
39-
</form>
53+
</a>
54+
</div>
4055
</div>
4156
</div>
4257
</div>

‎_includes/rowdy_creators_content.html‎

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,51 @@ <h2>No experience required to join!</h2>
2626
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
2727
<div data-aos="fade-up">
2828
<h3>Join Rowdy Creators!</h3>
29-
<form action="{{ site.baseurl }}{% link calendar.html %}">
30-
<button type="submit" class="btn-primary btn-block">
31-
<span>Events</span>
32-
<div class="icon d-flex align-items-center justify-content-center">
33-
<i class="bx bx-calendar-week"></i>
34-
</div>
35-
</button>
36-
</form>
37-
<form action="https://discord.gg/gvqbjZU">
38-
<button type="submit" class="btn-primary btn-block">
39-
<span>Join Discord</span>
40-
<div class="icon d-flex align-items-center justify-content-center">
41-
<i class="bx bxl-discord"></i>
42-
</div>
43-
</button>
44-
</form>
45-
<form action="{{ site.baseurl }}{% link member_new.html %}">
46-
<button type="submit" class="btn-primary btn-block">
47-
<span>Membership</span>
48-
<div class="icon d-flex align-items-center justify-content-center">
49-
<i class="bx bx-user"></i>
50-
</div>
51-
</button>
52-
</form>
29+
30+
<div class="sub-org-buttons">
31+
<div class="button_cont">
32+
<a class="main-button"
33+
href="{{ site.baseurl }}{% link calendar.html %}"
34+
rel="nofollow noopener noreferrer"
35+
draggable="false">
36+
<div class="icon-box">
37+
<i class="bx bx-calendar-week"></i>
38+
<h4>Events</h4>
39+
<p>Our meetings are listed on our calendar</p>
40+
</div>
41+
</a>
42+
</div>
43+
<div class="button_cont">
44+
<a class="main-button"
45+
href="https://discord.gg/gvqbjZU"
46+
target="_blank"
47+
rel="nofollow noopener noreferrer"
48+
draggable="false">
49+
<div class="icon-box">
50+
<i class="bx bxl-discord"></i>
51+
<h4>Join</h4>
52+
<p>Our Discord</p>
53+
</div>
54+
</a>
55+
</div>
56+
<div class="button_cont">
57+
<a class="main-button"
58+
href="{{ site.baseurl }}{% link member_new.html %}"
59+
target="_blank"
60+
rel="nofollow noopener noreferrer"
61+
draggable="false">
62+
<div class="icon-box">
63+
<i class="bx bx-user"></i>
64+
<h4>Membership</h4>
65+
<p>Fill out this form and become a member!</p>
66+
</div>
67+
</a>
68+
</div>
69+
</div>
5370
</div>
5471
</div>
5572

56-
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-left">
73+
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-left">
5774
<img src="{{ site.baseurl }}/assets/img/logos/480_rowdy_creators_logo.png" class="img-fluid" alt="">
5875
</div>
5976
</div>

‎_includes/rowdyhacks_content.html‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,61 @@
77
<section id="statement" class="col-12 d-flex flex-column justify-content-center align-items-center" data-aos="fade-up">
88
<div id="title" class="container text-center">
99
<h1>RowdyHacks</h1>
10-
<h2>RowdyHacks is ACM UTSA's annual hackathon held in April.</h2>
11-
<h2>Every year, a new committee of organizers get together to help plan and organize the biggest hackathon in San Antonio, TX accommodating hundreds of students, sponsors, volunteers, and mentors.</h2>
12-
<h2>Interested in sponsorship or being a RowdyHacks organizer? Reach out to us at [email protected] to see how you can get involved.</h2>
13-
<form action="https://www.rowdyhacks.org/">
14-
<button type="submit" class="btn-primary btn-block">
15-
<span>Go To RowdyHacks.org</span>
16-
</button>
17-
</form>
10+
<h2>RowdyHacks is ACM UTSA's annual hackathon held in the Fall.</h2>
11+
<h2>Every year, a committee of members get together to help plan and organize the largest hackathon in San Antonio, TX to accommodate hundreds of students, sponsors, volunteers, and mentors.</h2>
12+
<a href="https://www.rowdyhacks.org/" class="btn-get-started scrollto">Go To RowdyHacks.org</a>
1813
</div>
1914
</section>
2015

2116
<section id="about" class="about section-bg-option-2">
2217
<div class="container">
2318
<div class="row">
24-
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-right">
25-
<img src="{{ site.baseurl }}/assets/img/logos/rowdyhacks-city-logo.png" class="img-fluid" alt="">
19+
<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="">
2621
</div>
22+
2723
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
2824
<h3 data-aos="fade-up">Interested in Participating?</h3>
2925
<div data-aos="fade-up">
30-
<form action="mailto:[email protected]">
31-
<button type="submit" class="btn-primary btn-block">
32-
<span>Contact</span>
33-
<div class="icon d-flex align-items-center justify-content-center">
34-
<i class="bx bx-mail-send"></i>
35-
</div>
36-
</button>
37-
</form>
38-
<form action="https://discord.acmutsa.org">
39-
<button type="submit" class="btn-primary btn-block">
40-
<span>Join Discord</span>
41-
<div class="icon d-flex align-items-center justify-content-center">
42-
<i class="bx bxl-discord"></i>
43-
</div>
44-
</button>
45-
</form>
46-
<form action="{{ site.baseurl }}{% link member_new.html %}">
47-
<button type="submit" class="btn-primary btn-block">
48-
<span>Membership</span>
49-
<div class="icon d-flex align-items-center justify-content-center">
50-
<i class="bx bx-user"></i>
51-
</div>
52-
</button>
53-
</form>
26+
<div class="sub-org-buttons">
27+
<div class="button_cont">
28+
<a class="main-button"
29+
href="mailto:[email protected]"
30+
rel="nofollow noopener noreferrer"
31+
draggable="false">
32+
<div class="icon-box">
33+
<i class="bx bx-mail-send"></i>
34+
<h4>Contact Us</h4>
35+
<p>[email protected]</p>
36+
</div>
37+
</a>
38+
</div>
39+
<div class="button_cont">
40+
<a class="main-button"
41+
href="https://discord.acmutsa.org"
42+
target="_blank"
43+
rel="nofollow noopener noreferrer"
44+
draggable="false">
45+
<div class="icon-box">
46+
<i class="bx bxl-discord"></i>
47+
<h4>Join</h4>
48+
<p>ACM UTSA's Discord</p>
49+
</div>
50+
</a>
51+
</div>
52+
<div class="button_cont">
53+
<a class="main-button"
54+
href="{{ site.baseurl }}{% link member_new.html %}"
55+
rel="nofollow noopener noreferrer"
56+
draggable="false">
57+
<div class="icon-box">
58+
<i class="bx bx-user"></i>
59+
<h4>Membership</h4>
60+
<p>Fill out this form and become a member!</p>
61+
</div>
62+
</a>
63+
</div>
64+
</div>
5465
</div>
5566
</div>
5667
</div>

‎_includes/sponsor_perks_section.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,12 @@ <h2>Sponsor ACM Today!</h2>
8282
<div class="section-title" data-aos="fade-up">
8383
<p>Want to sponsor ACM? Check out our Sponsorship Packet!</p>
8484
<p><a href="https://drive.google.com/file/d/1SNykyLrV13FuVi6eZph43g8boaUiCTHl/view?usp=sharing" target="_blank">2021 - 2022 ACM Sponsorship Packet</a></p>
85+
<!-- <div class="button_cont" align="center">-->
86+
<!-- <a class="main-button"-->
87+
<!-- href="https://drive.google.com/file/d/1SNykyLrV13FuVi6eZph43g8boaUiCTHl/view?usp=sharing"-->
88+
<!-- target="_blank"-->
89+
<!-- rel="nofollow noopener noreferrer"-->
90+
<!-- draggable="false">2021 - 2022 ACM Sponsorship Packet</a>-->
91+
<!-- </div>-->
8592
<p><sub>* spots are limited so reach out soon!</sub></p>
8693
</div>

0 commit comments

Comments
 (0)