Skip to content

Commit

Permalink
Merge pull request #1106 from jyang0403/fix/icons-and-current-team
Browse files Browse the repository at this point in the history 
bugfix: fixed kitawesome icons and updated current/former members
  • Loading branch information
@jyang0403
jyang0403 authored Apr 2, 2024
2 parents 10b6a8c + 8081c00 commit 8514a81
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 57 deletions.
4 changes: 2 additions & 2 deletions agreement/templates/privacypolicy.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
ga('send', 'pageview');
</script>

<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://malsup.github.io/jquery.cycle2.js"></script>
<script type='text/javascript' src='/static/js/course-page.js'></script>
Expand Down Expand Up @@ -380,4 +380,4 @@ <h1 id="how-to-contact-us"><strong><em>How to Contact Us</em></strong></h1>
</footer>
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions agreement/templates/termsofservice.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
ga('send', 'pageview');
</script>

<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://malsup.github.io/jquery.cycle2.js"></script>
<script type='text/javascript' src='/static/js/course-page.js'></script>
Expand Down Expand Up @@ -404,4 +404,4 @@ <h1 id="other"><em>Other</em></h1>
</footer>
</body>

</html>
</html>
92 changes: 46 additions & 46 deletions semesterly/templates/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">

<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="{% static 'js/splash.js'%}"></script>

Expand Down Expand Up @@ -148,28 +148,6 @@ <h3>JHU '25</h3>
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/jessie.png)"></div>
<h4 class="name">Jessie Luo</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '24</h3>
<div class="social">
<a href="https://github.com/JessieLuo30"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/jessie-luo-bc076/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/andreasjaramillo.jpg)"></div>
<h4 class="name">Andreas Jaramillo</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '26</h3>
<div class="social">
<a href="https://github.com/andyjaramillo"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/andreas-jaramillo/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/spencerhuang.png)"></div>
<h4 class="name">Spencer Huang</h4>
Expand All @@ -181,18 +159,6 @@ <h3>JHU '26</h3>
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/kirondeb.jpg)"></div>
<h4 class="name">Kiron Deb</h4>
<h3>Software Engineer - Frontend</h3>
<h3>JHU '25</h3>
<div class="social">
<a href="/"><i class="fa fa-fw fa-link fa-2x"></i></a>
<a href="https://github.com/K02D"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/kiron-deb-2aa4a4163/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/jiashucopy.jpg)"></div>
<h4 class="name">Jiashu Yang</h4>
Expand All @@ -204,17 +170,6 @@ <h3>JHU '25</h3>
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/jerrychen.jpg)"></div>
<h4 class="name">Jiarui Chen</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '24</h3>
<div class="social">
<a href="https://github.com/jchen324"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/jiarui-chen/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-3 member">
<div class="circular" style="background-image: url(/static/img/tanvi.jpg)"></div>
<h4 class="name">Tanvi Ranade</h4>
Expand Down Expand Up @@ -274,6 +229,51 @@ <h3>JHU '23</h3>
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-4 member">
<div class="circular" style="background-image: url(/static/img/kirondeb.jpg)"></div>
<h4 class="name">Kiron Deb</h4>
<h3>Software Engineer - Frontend</h3>
<h3>JHU '25</h3>
<div class="social">
<a href="/"><i class="fa fa-fw fa-link fa-2x"></i></a>
<a href="https://github.com/K02D"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/kiron-deb-2aa4a4163/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-4 member">
<div class="circular" style="background-image: url(/static/img/jerrychen.jpg)"></div>
<h4 class="name">Jiarui Chen</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '24</h3>
<div class="social">
<a href="https://github.com/jchen324"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/jiarui-chen/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-4 member">
<div class="circular" style="background-image: url(/static/img/jessie.png)"></div>
<h4 class="name">Jessie Luo</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '24</h3>
<div class="social">
<a href="https://github.com/JessieLuo30"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/jessie-luo-bc076/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-4 member">
<div class="circular" style="background-image: url(/static/img/andreasjaramillo.jpg)"></div>
<h4 class="name">Andreas Jaramillo</h4>
<h3>Software Engineer - FullStack</h3>
<h3>JHU '26</h3>
<div class="social">
<a href="https://github.com/andyjaramillo"><i class="fab fa-github fa-2x"></i></a>
<a href="https://www.linkedin.com/in/andreas-jaramillo/"><i
class="fab fa-linkedin fa-2x"></i></a>
</div>
</div>
<div class="col-1-4 member">
<div class="circular" style="background-image: url(/static/img/lauren-back.jfif)"></div>
<h4 class="name">Lauren Back</h4>
Expand Down
4 changes: 2 additions & 2 deletions semesterly/templates/notice.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css"
integrity="sha384-wESLQ85D6gbsF459vf1CiZ2+rr+CsxRY0RpiF1tLlQpDnAgg6rwdsUF1+Ics2bni" crossorigin="anonymous">
<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>
</head>

<body>
Expand Down Expand Up @@ -62,4 +62,4 @@ <h1>Semester.ly</h1>
</div>
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions timetable/templates/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css"
integrity="sha384-wESLQ85D6gbsF459vf1CiZ2+rr+CsxRY0RpiF1tLlQpDnAgg6rwdsUF1+Ics2bni" crossorigin="anonymous">
<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>

{% block css_block %}{% endblock %}
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
Expand Down Expand Up @@ -96,4 +96,4 @@ <h6>COPYRIGHT © 2017 SEMESTERLY TECHNOLOGIES, LLC.</h6>
</footer>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion timetable/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css"
integrity="sha384-wESLQ85D6gbsF459vf1CiZ2+rr+CsxRY0RpiF1tLlQpDnAgg6rwdsUF1+Ics2bni" crossorigin="anonymous">
<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="{% static 'js/splash.js'%}"></script>
<!-- Google Analytics script -->
Expand Down
2 changes: 1 addition & 1 deletion timetable/templates/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css"
integrity="sha384-wESLQ85D6gbsF459vf1CiZ2+rr+CsxRY0RpiF1tLlQpDnAgg6rwdsUF1+Ics2bni" crossorigin="anonymous">
<script src="https://kit.fontawesome.com/54815f8287.js" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script>

<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
Expand Down
2 changes: 1 addition & 1 deletion timetable/templates/timetable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" type="text/css" rel="stylesheet"
integrity="sha256-7s5uDGW3AHqw6xtJmNNtr+OBRJUlgkNJEo78P4b0yRw= sha512-nNo+yCHEyn0smMxSswnf/OnX6/KwJuZTlNZBjauKhTK0c+zT+q5JOCx0UFhXQ6rJR9jg6Es8gPuD2uZcYDLqSw=="
crossorigin="anonymous">
<script src="https://kit.fontawesome.com/a44255b29c.js" crossorigin="anonymous"></script> <link rel="stylesheet" type="text/css"
<script src="https://kit.fontawesome.com/2ab9935212.js" crossorigin="anonymous"></script> <link rel="stylesheet" type="text/css"
href="https://cdnjs.cloudflare.com/ajax/libs/flat-ui/2.3.0/css/flat-ui.min.css">
<link rel="stylesheet" type="text/css" href="{% static 'css/full-calendar.min.css'%}">
<link rel="stylesheet" type="text/css" href="{% static 'css/ball-clip-rotate-multiple.css'%}">
Expand Down

0 comments on commit 8514a81

Please sign in to comment.