Skip to content

Feature/button update #18

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 6 commits into from
Feb 18, 2022
Merged

Feature/button update #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcf7aa7
Initial button test
Zaqttack Aug 20, 2021
9faa701
changed acmw buttons
Zaqttack Aug 20, 2021
75978c8
sponsorship packet buttons
Zaqttack Aug 20, 2021
6a51d75
re-updated Gemfile
Zaqttack Feb 17, 2022
32aadb0
Changed button styling
Zaqttack Feb 17, 2022
71a24d8
Merge branch 'main' into feature/button-update
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
10 changes: 5 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ gem "minima", "~> 2.5"

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

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

# gem "github-pages", "~> 214", group: :jekyll_plugins
gem "github-pages", "~> 214", group: :jekyll_plugins
gem "webrick", "~> 1.7"
67 changes: 41 additions & 26 deletions _includes/acmw_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,50 @@ <h3 data-aos="fade-up">About Us</h3>
</p><br>
<div data-aos="fade-up">
<h3>Join ACM-W!</h3>
<form action="{{ site.baseurl }}{% link calendar.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Events</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-calendar-week"></i>
</div>
</button>
</form>
<form action="https://discord.acmutsa.org">
<button type="submit" class="btn-primary btn-block">
<span>Join Discord</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bxl-discord"></i>
</div>
</button>
</form>
<form action="{{ site.baseurl }}{% link member_new.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Membership</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-user"></i>
</div>
</button>
</form>
<div class="sub-org-buttons">
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link calendar.html %}"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-calendar-week"></i>
<h4>Events</h4>
<p>Our meetings are listed on our calendar</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="https://discord.acmutsa.org"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bxl-discord"></i>
<h4>Join</h4>
<p>Our Discord</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link member_new.html %}"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-user"></i>
<h4>Membership</h4>
<p>Fill out this form and become a member!</p>
</div>
</a>
</div>
</div>
</div>
</div>

<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-left">
<img src="../assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid"></a>
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-left">
<img src="../assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
</div>
</div>
</div>
Expand Down
59 changes: 37 additions & 22 deletions _includes/icpc_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="about" class="about section-bg-option-2">
<div class="container">
<div class="row">
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-right">
<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/icpc-logo.png" class="img-fluid" alt="icpc logo">
</div>
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
Expand All @@ -12,31 +12,46 @@ <h3 data-aos="fade-up">What is ICPC?</h3>
varying difficulty, from easy to extremely hard.
</p><br>
<h3 data-aos="fade-up">Interested in Joining?</h3>
<div data-aos="fade-up">
<form action="mailto:[email protected]">
<button type="submit" class="btn-primary btn-block">
<span>Contact</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-mail-send"></i>
</div>
</button>
</form>
<form action="https://discord.gg/qfckfeQ">
<button type="submit" class="btn-primary btn-block">
<span>Join Discord</span>
<div class="icon d-flex align-items-center justify-content-center">

<div class="sub-org-buttons" data-aos="fade-up">
<div class="button_cont">
<a class="main-button"
href="https://discord.gg/qfckfeQ"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bxl-discord"></i>
<h4>Join</h4>
<p>Our Discord</p>
</div>
</button>
</form>
<form action="{{ site.baseurl }}{% link member_new.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Membership</span>
<div class="icon d-flex align-items-center justify-content-center">
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link member_new.html %}"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-user"></i>
<h4>Membership</h4>
<p>Fill out this form and become a member!</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="mailto:[email protected]"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-mail-send"></i>
<h4>Contact</h4>
<p>The Director at [email protected]</p>
</div>
</button>
</form>
</a>
</div>
</div>
</div>
</div>
Expand Down
67 changes: 42 additions & 25 deletions _includes/rowdy_creators_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,51 @@ <h2>No experience required to join!</h2>
<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
<div data-aos="fade-up">
<h3>Join Rowdy Creators!</h3>
<form action="{{ site.baseurl }}{% link calendar.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Events</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-calendar-week"></i>
</div>
</button>
</form>
<form action="https://discord.gg/gvqbjZU">
<button type="submit" class="btn-primary btn-block">
<span>Join Discord</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bxl-discord"></i>
</div>
</button>
</form>
<form action="{{ site.baseurl }}{% link member_new.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Membership</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-user"></i>
</div>
</button>
</form>

<div class="sub-org-buttons">
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link calendar.html %}"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-calendar-week"></i>
<h4>Events</h4>
<p>Our meetings are listed on our calendar</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="https://discord.gg/gvqbjZU"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bxl-discord"></i>
<h4>Join</h4>
<p>Our Discord</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link member_new.html %}"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-user"></i>
<h4>Membership</h4>
<p>Fill out this form and become a member!</p>
</div>
</a>
</div>
</div>
</div>
</div>

<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-left">
<div class="col-xl-6 col-lg-7 hidden-on-mobile center-in-container" data-aos="fade-left">
<img src="{{ site.baseurl }}/assets/img/logos/480_rowdy_creators_logo.png" class="img-fluid" alt="">
</div>
</div>
Expand Down
79 changes: 45 additions & 34 deletions _includes/rowdyhacks_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,50 +7,61 @@
<section id="statement" class="col-12 d-flex flex-column justify-content-center align-items-center" data-aos="fade-up">
<div id="title" class="container text-center">
<h1>RowdyHacks</h1>
<h2>RowdyHacks is ACM UTSA's annual hackathon held in April.</h2>
<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>
<h2>Interested in sponsorship or being a RowdyHacks organizer? Reach out to us at [email protected] to see how you can get involved.</h2>
<form action="https://www.rowdyhacks.org/">
<button type="submit" class="btn-primary btn-block">
<span>Go To RowdyHacks.org</span>
</button>
</form>
<h2>RowdyHacks is ACM UTSA's annual hackathon held in the Fall.</h2>
<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>
<a href="https://www.rowdyhacks.org/" class="btn-get-started scrollto">Go To RowdyHacks.org</a>
</div>
</section>

<section id="about" class="about section-bg-option-2">
<div class="container">
<div class="row">
<div class="col-xl-6 col-lg-7 align-self-center text-center" data-aos="fade-right">
<img src="{{ site.baseurl }}/assets/img/logos/rowdyhacks-city-logo.png" class="img-fluid" alt="">
<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="">
</div>

<div class="col-xl-6 col-lg-5 pt-5 pt-lg-0">
<h3 data-aos="fade-up">Interested in Participating?</h3>
<div data-aos="fade-up">
<form action="mailto:[email protected]">
<button type="submit" class="btn-primary btn-block">
<span>Contact</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-mail-send"></i>
</div>
</button>
</form>
<form action="https://discord.acmutsa.org">
<button type="submit" class="btn-primary btn-block">
<span>Join Discord</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bxl-discord"></i>
</div>
</button>
</form>
<form action="{{ site.baseurl }}{% link member_new.html %}">
<button type="submit" class="btn-primary btn-block">
<span>Membership</span>
<div class="icon d-flex align-items-center justify-content-center">
<i class="bx bx-user"></i>
</div>
</button>
</form>
<div class="sub-org-buttons">
<div class="button_cont">
<a class="main-button"
href="mailto:[email protected]"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-mail-send"></i>
<h4>Contact Us</h4>
<p>[email protected]</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="https://discord.acmutsa.org"
target="_blank"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bxl-discord"></i>
<h4>Join</h4>
<p>ACM UTSA's Discord</p>
</div>
</a>
</div>
<div class="button_cont">
<a class="main-button"
href="{{ site.baseurl }}{% link member_new.html %}"
rel="nofollow noopener noreferrer"
draggable="false">
<div class="icon-box">
<i class="bx bx-user"></i>
<h4>Membership</h4>
<p>Fill out this form and become a member!</p>
</div>
</a>
</div>
</div>
</div>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions _includes/sponsor_perks_section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,12 @@ <h2>Sponsor ACM Today!</h2>
<div class="section-title" data-aos="fade-up">
<p>Want to sponsor ACM? Check out our Sponsorship Packet!</p>
<p><a href="https://drive.google.com/file/d/1SNykyLrV13FuVi6eZph43g8boaUiCTHl/view?usp=sharing" target="_blank">2021 - 2022 ACM Sponsorship Packet</a></p>
<!-- <div class="button_cont" align="center">-->
<!-- <a class="main-button"-->
<!-- href="https://drive.google.com/file/d/1SNykyLrV13FuVi6eZph43g8boaUiCTHl/view?usp=sharing"-->
<!-- target="_blank"-->
<!-- rel="nofollow noopener noreferrer"-->
<!-- draggable="false">2021 - 2022 ACM Sponsorship Packet</a>-->
<!-- </div>-->
<p><sub>* spots are limited so reach out soon!</sub></p>
</div>
Loading