Skip to content

Commit 71a24d8

Browse files
committed
Merge branch 'main' into feature/button-update
2 parents 32aadb0 + 6a51d75 commit 71a24d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+515
-244
lines changed

.DS_Store

2 KB
Binary file not shown.

.gitignore

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,81 @@
1-
.idea/
21
_site
32
.sass-cache
43
.jekyll-cache/
54
.jekyll-metadata
65
vendor
6+
7+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
8+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
9+
.idea/
10+
11+
# User-specific stuff
12+
.idea/**/workspace.xml
13+
.idea/**/tasks.xml
14+
.idea/**/usage.statistics.xml
15+
.idea/**/dictionaries
16+
.idea/**/shelf
17+
18+
# AWS User-specific
19+
.idea/**/aws.xml
20+
21+
# Generated files
22+
.idea/**/contentModel.xml
23+
24+
# Sensitive or high-churn files
25+
.idea/**/dataSources/
26+
.idea/**/dataSources.ids
27+
.idea/**/dataSources.local.xml
28+
.idea/**/sqlDataSources.xml
29+
.idea/**/dynamic.xml
30+
.idea/**/uiDesigner.xml
31+
.idea/**/dbnavigator.xml
32+
33+
# Gradle
34+
.idea/**/gradle.xml
35+
.idea/**/libraries
36+
37+
# Gradle and Maven with auto-import
38+
# When using Gradle or Maven with auto-import, you should exclude module files,
39+
# since they will be recreated, and may cause churn. Uncomment if using
40+
# auto-import.
41+
# .idea/artifacts
42+
# .idea/compiler.xml
43+
# .idea/jarRepositories.xml
44+
# .idea/modules.xml
45+
# .idea/*.iml
46+
# .idea/modules
47+
# *.iml
48+
# *.ipr
49+
50+
# CMake
51+
cmake-build-*/
52+
53+
# Mongo Explorer plugin
54+
.idea/**/mongoSettings.xml
55+
56+
# File-based project format
57+
*.iws
58+
59+
# IntelliJ
60+
out/
61+
62+
# mpeltonen/sbt-idea plugin
63+
.idea_modules/
64+
65+
# JIRA plugin
66+
atlassian-ide-plugin.xml
67+
68+
# Cursive Clojure plugin
69+
.idea/replstate.xml
70+
71+
# Crashlytics plugin (for Android Studio and IntelliJ)
72+
com_crashlytics_export_strings.xml
73+
crashlytics.properties
74+
crashlytics-build.properties
75+
fabric.properties
76+
77+
# Editor-based Rest Client
78+
.idea/httpRequests
79+
80+
# Android studio 3.1+ serialized cache file
81+
.idea/caches/build_file_checksums.ser

.idea/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.idea/acmtusa.github.io.iml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

Gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ GEM
215215
jekyll-seo-tag (~> 2.1)
216216
minitest (5.14.4)
217217
multipart-post (2.1.1)
218+
nokogiri (1.11.3-arm64-darwin)
219+
racc (~> 1.4)
218220
nokogiri (1.11.3-x86_64-darwin)
219221
racc (~> 1.4)
220222
octokit (4.21.0)
@@ -259,11 +261,11 @@ GEM
259261
zeitwerk (2.4.2)
260262

261263
PLATFORMS
264+
universal-darwin-20
262265
x86_64-darwin-19
263266

264267
DEPENDENCIES
265-
github-pages (~> 214)
266-
jekyll-feed (~> 0.12)
268+
github-pages
267269
minima (~> 2.5)
268270
tzinfo (~> 1.2)
269271
tzinfo-data

_includes/acmw_content.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h4>Membership</h4>
5555
</div>
5656

5757
<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"></a>
58+
<img src="../assets/img/logos/480_acm_w_logo.png" alt="acm-w logo" class="img-fluid">
5959
</div>
6060
</div>
6161
</div>

_includes/contact_section.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<section id="contact" class="contact section-bg-option-2">
2-
<div class="container" data-aos="fade-up">
2+
<div class="container"> <!-- data-aos="fade-up"-->
33

44
<div class="section-title">
55
<h2>Contact</h2>
66
</div>
77

88
<div class="row no-gutters justify-content-center">
9-
109
<div class="col-lg-5 d-flex align-items-stretch">
1110
<div class="info">
1211
<a href="https://www.google.com/maps/place/The+University+of+Texas+at+San+Antonio/@29.5827351,-98.6189053,15z/data=!4m5!3m4!1s0x0:0x24e55c903c3a270c!8m2!3d29.5827351!4d-98.6189053">
1312
<div class="address">
14-
<i class="bx bx-map-pin"></i>
13+
<i class="bx bx-map-pin"></i>
1514
<h4>Location:</h4>
1615
<p>1 UTSA Circle, San Antonio, TX 78249</p>
1716
</div>

_includes/footer.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ <h4>Our Sub-Organizations</h4>
4242
<h4>Resources</h4>
4343
<ul>
4444
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link member_new.html %}">Register</a></li>
45-
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link feedback.html %}">Feedback</a></li>
4645
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link member_update_info.html %}">Update Member</a></li>
4746
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link member_update_address.html %}">Update Address</a></li>
47+
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link membership/attendance.html %}">Track Attendance</a></li>
48+
<li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link feedback.html %}">Feedback</a></li>
4849
<li><i class="bx bx-chevron-right"></i><a href="https://drive.google.com/file/d/1IaRj6Nl2F467vu9xBJajbMHbHri4ymUo/view?usp=sharing">Constitution</a></li>
4950
<!-- <li><i class="bx bx-chevron-right"></i><a href="">Code of Conduct</a></li>-->
5051
<!-- <li><i class="bx bx-chevron-right"></i><a href="{{ site.baseurl }}{% link faq.html %}">F.A.Q.</a></li>-->
@@ -68,4 +69,6 @@ <h4>Resources</h4>
6869
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
6970
<script src="{{ site.baseurl }}{% link assets/js/main.js %}"></script>
7071
<script src="https://unpkg.com/boxicons@latest/dist/boxicons.js"></script>
72+
<!-- Slick -->
73+
<script src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.js" integrity="sha512-XtmMtDEcNz2j7ekrtHvOVR4iwwaD6o/FUJe6+Zq+HgcCsk3kj4uSQQR8weQ2QVj1o0Pk6PwYLohm206ZzNfubg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
7174

_includes/head.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
<!-- Vendor CSS -->
2222
<link href='https://unpkg.com/[email protected]/css/boxicons.min.css' rel='stylesheet'>
23+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" integrity="sha512-17EgCFERpgZKcm0j0fEq1YCJuyAWdz9KUtv1EjVuaOz8pDnh/0nZxmU6BBXwaaxqoi9PQXnRWqlcDB027hgv9A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
24+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" integrity="sha512-yHknP1/AwR+yx26cB1y0cjvQUMvEa2PFzt1c9LlS4pRQ5NOTZFWbhBig+X9G9eYW/8m0/4OXNx8pxJ6z57x0dw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
2325

2426
<!-- Scripts -->
2527
<script src="https://code.iconify.design/1/1.0.7/iconify.min.js"></script>

0 commit comments

Comments
 (0)