Skip to content
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.

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

Updates to events page and transition additions #8

Merged
merged 2 commits into from
Nov 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions about.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>The Family</title>
<title>Our Team</title>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
Expand Down Expand Up @@ -538,9 +538,9 @@ <h4>Links</h4>
</div>
</div>
<div class="col-sm-4 align-items-center">
<a href="https://www.facebook.com/phoenix.lnmiit/"><span class="fa fa-facebook footer-social"></span></a> &emsp;
<a href="https://www.youtube.com/channel/UCkgCJ_wF-E35nU_6HZGF0Sg"><span class="fa fa-youtube footer-social"></span></a> &emsp;
<a href="mailto:[email protected]"><span class="fa fa-envelope-o footer-social"></span></a> &emsp;
<a href="https://www.facebook.com/phoenix.lnmiit/" target="_blank"><span class="fa fa-facebook footer-social"></span></a> &emsp;
<a href="https://www.youtube.com/channel/UCkgCJ_wF-E35nU_6HZGF0Sg" target="_blank"><span class="fa fa-youtube footer-social"></span></a> &emsp;
<a href="mailto:[email protected]" target="_blank"><span class="fa fa-envelope-o footer-social"></span></a> &emsp;
</div>
</div>
</div>
Expand Down
30 changes: 30 additions & 0 deletions css/events.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.events-container {
padding-top: 20px;
}
.events-row {
padding-top: 20px;
padding-bottom: 20px;
}
.events-image {
width: 270px;
height: 150px;
}
.events-heading {
font-family: 'Average', serif;
}
.events-text {
font-family: 'Average', serif;
font-style: italic;
}
.plinth-text {
font-family: 'Average', serif;
text-align: center;
font-size: 80px;
}
.events-image {
transition: width 1s, height 1s;
}
.events-image:hover {
width: 540px;
height: 350px;
}
8 changes: 3 additions & 5 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ body {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 5 32 23' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#FFA500' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
}
.navbar-right {
margin-right: 0;
margin-right: 0px;
}
.navbar-custom {
margin: auto;
padding: 0px 10px;
background-color: rgba(0,0,0,0.2);
}
Expand All @@ -31,7 +32,6 @@ body {
margin-left: 10px;
}
.jumbotron {
min-height: 600px;
background-color: #000;
margin-bottom: 0px;
display: flex;
Expand All @@ -45,9 +45,7 @@ body {
padding-top: 5%;
}

h1 {
font-size: 150px !important;
}

.header-text {
color: #FFA500;
font-size: 100px;
Expand Down
337 changes: 337 additions & 0 deletions events.html

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<nav class="navbar fixed-top navbar-custom navbar-expand-lg">
<div class="container-fluid">
<a class="navbar-brand" href="index.html"><img src="src/img/logo.jpg"></a>
<button class="navbar-toggler" id="navbar-toggler-icon" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler collapsed" id="navbar-toggler-icon" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" ></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<ul class="nav navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="index.html">Home <span class="sr-only">(current)</span></a>
</li>
Expand Down Expand Up @@ -174,9 +174,9 @@ <h4>Links</h4>
</div>
</div>
<div class="col-sm-4 align-items-center">
<a href="https://www.facebook.com/phoenix.lnmiit/"><span class="fa fa-facebook footer-social"></span></a> &emsp;
<a href="https://www.youtube.com/channel/UCkgCJ_wF-E35nU_6HZGF0Sg"><span class="fa fa-youtube footer-social"></span></a> &emsp;
<a href="mailto:[email protected]"><span class="fa fa-envelope-o footer-social"></span></a> &emsp;
<a href="https://www.facebook.com/phoenix.lnmiit/" target="_blank"><span class="fa fa-facebook footer-social"></span></a> &emsp;
<a href="https://www.youtube.com/channel/UCkgCJ_wF-E35nU_6HZGF0Sg" target="_blank"><span class="fa fa-youtube footer-social"></span></a> &emsp;
<a href="mailto:[email protected]" target="_blank"><span class="fa fa-envelope-o footer-social"></span></a> &emsp;
</div>
</div>
</div>
Expand Down
Binary file added src/img/events/introtorobotics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_drone/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_drone/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_drone/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_drone/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_lfr/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_lfr/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_lfr/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_lfr/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_rcplane/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_rcplane/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_rcplane/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_rcplane/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robosoccerroborace/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robosoccerroborace/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robosoccerroborace/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robosoccerroborace/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robowar/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robowar/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robowar/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_robowar/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_sop/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_sop/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_sop/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/plinth_sop/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/events/rcplane/1.jpg
Binary file added src/img/events/rcplane/2.jpg
Binary file added src/img/events/rcplane/3.jpg
Binary file added src/img/events/rcplane/4.jpg
Binary file added src/img/events/torque18/1.jpg
Binary file added src/img/events/torque18/2.jpg
Binary file added src/img/events/torque18/3.jpg
Binary file added src/img/events/torque18/4.jpg