Skip to content

Commit

Permalink
Added photos, resolved bugs, and added title to menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Fromalaska49 committed Oct 28, 2016
1 parent 939c465 commit 83026f6
Show file tree
Hide file tree
Showing 4,932 changed files with 442,081 additions and 73 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions about.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
</ul>
</div>
</div>
<div class="row section-container" id="about-page-tamuhacks-image">
<div class="col-sm-12">
</div>
</div>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions calendar.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<?php
require_once(__DIR__ . '/vendor/autoload.php');
?>
<!DOCTYPE html>
<html>
<head>
Expand Down
56 changes: 30 additions & 26 deletions common/footer.php
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
<footer>
<div id="footer" class="container">
Copyright &copy; 2016 ACM UTSA
<div style="float:right;">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
<div class="row">
<div class="col-sm-6" id="copyright-container">
Copyright &copy; 2016 ACM UTSA
</div>
<div class="col-sm-6" id="social-media-container">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
</div>
</div>
</div>
</footer>
7 changes: 7 additions & 0 deletions common/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
<a class="navbar-brand" href=".">
<img id="logo" src="images/logo-bordered.png" alt="The Assocation for Computing Machinery - UTSA Chapter">
</a>
<h1>
Association for
<br />
Computing
<br />
Machinery
</h1>
</div> <!-- .navbar-header -->
<div class="collapse navbar-collapse" id="nav-collapse">
<ul class="nav navbar-nav navbar-right">
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"require": {
"stripe/stripe-php": "3.*"
"stripe/stripe-php": "3.*",
"google/apiclient": "2.0"
}
}
}
Loading

0 comments on commit 83026f6

Please sign in to comment.